From 821098998fb3df7f7bc16ed53f565dfa4e4696a3 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 16:33:32 +0800 Subject: [PATCH 01/10] update cygwin-config-ext.sh --- sapi/scripts/cygwin/cygwin-config-ext.sh | 74 ++++++++++++++---------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index be1db15a00..f3494fe530 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -11,49 +11,61 @@ __PROJECT__=$( ) cd ${__PROJECT__} -ROOT=${__PROJECT__} - REDIS_VERSION=5.3.7 MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 -if [ ! -d pool/ext ]; then - mkdir -p pool/ext -fi +mkdir -p pool/ext +mkdir -p pool/lib +mkdir -p pool/php-tar -cd pool/ext +WORK_DIR=${__PROJECT__}/var/cygwin-build/ +EXT_TEMP_CACHE_DIR=${WORK_DIR}/pool/ext/ +mkdir -p ${WORK_DIR} +mkdir -p ${EXT_TEMP_CACHE_DIR} +test -d ${WORK_DIR}/ext/ && rm -rf ${WORK_DIR}/ext/ +mkdir -p ${WORK_DIR}/ext/ -if [ ! -d $ROOT/ext/redis ]; then - if [ ! -f redis-${REDIS_VERSION}.tgz ]; then - curl -fSLo redis-${REDIS_VERSION}.tgz https://pecl.php.net/get/redis-${REDIS_VERSION}.tgz - fi - tar xvf redis-${REDIS_VERSION}.tgz - mv redis-${REDIS_VERSION} $ROOT/ext/redis +cd ${__PROJECT__}/pool/ext +if [ ! -f redis-${REDIS_VERSION}.tgz ]; then + curl -fSLo ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz https://pecl.php.net/get/redis-${REDIS_VERSION}.tgz + mv ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz ${__PROJECT__}/pool/ext fi +mkdir -p ${WORK_DIR}/ext/redis/ +tar --strip-components=1 -C ${WORK_DIR}/ext/redis/ -xf redis-${REDIS_VERSION}.tgz + +: < Date: Fri, 10 Jan 2025 16:35:21 +0800 Subject: [PATCH 02/10] update cygwin-config-ext.sh --- sapi/scripts/cygwin/cygwin-config-ext.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index f3494fe530..8fdb401ca3 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -65,7 +65,8 @@ fi mkdir -p ${WORK_DIR}/ext/imagick/ tar --strip-components=1 -C ${WORK_DIR}/ext/imagick/ -xf imagick-${IMAGICK_VERSION}.tgz -# cp -rf var/cygwin-build/ext/* var/ +cd ${__PROJECT__} +# cp -rf var/cygwin-build/ext/* ext/ cp -rf ${WORK_DIR}/ext/* ${__PROJECT__}/ext/ cd ${__PROJECT__} From 9512c18bdb5bd4529ceaad186cd1c81283ea95cf Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 16:44:43 +0800 Subject: [PATCH 03/10] update download-cygwin.bat --- sapi/quickstart/windows/cygwin-build/download-cygwin.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/quickstart/windows/cygwin-build/download-cygwin.bat b/sapi/quickstart/windows/cygwin-build/download-cygwin.bat index 1b5e928bf8..a3b04b4c4a 100644 --- a/sapi/quickstart/windows/cygwin-build/download-cygwin.bat +++ b/sapi/quickstart/windows/cygwin-build/download-cygwin.bat @@ -12,9 +12,9 @@ cd /d ..\..\..\..\ set "__PROJECT__=%cd%" echo %cd% -md %__PROJECT__%\var\windows-cygwin-build-deps\ +md %__PROJECT__%\var\cygwin-build\ -cd /d %__PROJECT__%\var\windows-cygwin-build-deps\ +cd /d %__PROJECT__%\var\cygwin-build\ curl.exe -fSLo setup-x86_64.exe https://cygwin.com/setup-x86_64.exe From edd7fb0faf582ddc7b7d928fc0c3f27342e110d5 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 18:55:29 +0800 Subject: [PATCH 04/10] =?UTF-8?q?cygwin=20=E5=A2=9E=E5=8A=A0shell=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=89=93=E5=8C=85php.exe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/scripts/cygwin/cygwin-pack.sh | 42 ++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 sapi/scripts/cygwin/cygwin-pack.sh diff --git a/sapi/scripts/cygwin/cygwin-pack.sh b/sapi/scripts/cygwin/cygwin-pack.sh new file mode 100644 index 0000000000..a40dd67588 --- /dev/null +++ b/sapi/scripts/cygwin/cygwin-pack.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +set -exu +__DIR__=$( + cd "$(dirname "$0")" + pwd +) +__PROJECT__=$( + cd ${__DIR__}/../../../ + pwd +) +cd ${__PROJECT__} + +cd ${__PROJECT__}/ +ldd ${__PROJECT__}/bin/php.exe + +cd ${__PROJECT__} +APP_VERSION=$(${__PROJECT__}/bin/php.exe -v | head -n 1 | awk '{ print $2 }') +NAME="php-v${APP_VERSION}-cygwin-x64" + +test -d /tmp/${NAME} && rm -rf /tmp/${NAME} +mkdir -p /tmp/${NAME} +mkdir -p /tmp/${NAME}/etc/ + +cd ${__PROJECT__}/ +ldd ${__PROJECT__}/bin/php.exe -v | grep -v '/cygdrive/' | awk '{print $3}' +ldd ${__PROJECT__}/bin/php.exe -v | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/ + +ls -lh /tmp/${NAME}/ + +cp -f ${__PROJECT__}/bin/php.exe /tmp/${NAME}/ +# cp -f ${__PROJECT__}/bin/LICENSE /tmp/${NAME}/ +# cp -f ${__PROJECT__}/bin/credits.html /tmp/${NAME}/ + +cp -rL /etc/pki/ /tmp/${NAME}/etc/ + +cd /tmp/${NAME}/ + +test -f ${__PROJECT__}/${NAME}.zip && rm -f ${__PROJECT__}/${NAME}.zip +zip -r ${__PROJECT__}/${NAME}.zip . + +cd ${__PROJECT__} From 07147427b167e99537976859ae0faccaa348e30d Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 18:57:48 +0800 Subject: [PATCH 05/10] update cygwin-pack.sh --- sapi/scripts/cygwin/cygwin-pack.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-pack.sh b/sapi/scripts/cygwin/cygwin-pack.sh index a40dd67588..93f13fdc8d 100644 --- a/sapi/scripts/cygwin/cygwin-pack.sh +++ b/sapi/scripts/cygwin/cygwin-pack.sh @@ -15,16 +15,16 @@ cd ${__PROJECT__}/ ldd ${__PROJECT__}/bin/php.exe cd ${__PROJECT__} -APP_VERSION=$(${__PROJECT__}/bin/php.exe -v | head -n 1 | awk '{ print $2 }') -NAME="php-v${APP_VERSION}-cygwin-x64" +APP_VERSION=$(${__PROJECT__}/bin/swoole-cli.exe -v | head -n 1 | awk '{ print $2 }') +NAME="swoole-cli-v${APP_VERSION}-cygwin-x64" test -d /tmp/${NAME} && rm -rf /tmp/${NAME} mkdir -p /tmp/${NAME} mkdir -p /tmp/${NAME}/etc/ cd ${__PROJECT__}/ -ldd ${__PROJECT__}/bin/php.exe -v | grep -v '/cygdrive/' | awk '{print $3}' -ldd ${__PROJECT__}/bin/php.exe -v | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/ +ldd ${__PROJECT__}/bin/swoole-cli.exe -v | grep -v '/cygdrive/' | awk '{print $3}' +ldd ${__PROJECT__}/bin/swoole-cli.exe -v | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/ ls -lh /tmp/${NAME}/ From ac1dc9c964af77613d86b461d98f385a065f1337 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 18:58:23 +0800 Subject: [PATCH 06/10] update cygwin-pack.sh --- sapi/scripts/cygwin/cygwin-pack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-pack.sh b/sapi/scripts/cygwin/cygwin-pack.sh index 93f13fdc8d..3cc4f80eff 100644 --- a/sapi/scripts/cygwin/cygwin-pack.sh +++ b/sapi/scripts/cygwin/cygwin-pack.sh @@ -12,7 +12,7 @@ __PROJECT__=$( cd ${__PROJECT__} cd ${__PROJECT__}/ -ldd ${__PROJECT__}/bin/php.exe +ldd ${__PROJECT__}/bin/swoole-cli.exe cd ${__PROJECT__} APP_VERSION=$(${__PROJECT__}/bin/swoole-cli.exe -v | head -n 1 | awk '{ print $2 }') @@ -28,7 +28,7 @@ ldd ${__PROJECT__}/bin/swoole-cli.exe -v | grep -v '/cygdrive/' | awk '{print $3 ls -lh /tmp/${NAME}/ -cp -f ${__PROJECT__}/bin/php.exe /tmp/${NAME}/ +cp -f ${__PROJECT__}/bin/swoole-cli.exe /tmp/${NAME}/ # cp -f ${__PROJECT__}/bin/LICENSE /tmp/${NAME}/ # cp -f ${__PROJECT__}/bin/credits.html /tmp/${NAME}/ From b6366823c235d31df6711bffb17b96769ef2752e Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Fri, 10 Jan 2025 19:16:54 +0800 Subject: [PATCH 07/10] update cygwin-pack.sh --- sapi/scripts/cygwin/cygwin-pack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-pack.sh b/sapi/scripts/cygwin/cygwin-pack.sh index 3cc4f80eff..6c28a27ea1 100644 --- a/sapi/scripts/cygwin/cygwin-pack.sh +++ b/sapi/scripts/cygwin/cygwin-pack.sh @@ -23,8 +23,8 @@ mkdir -p /tmp/${NAME} mkdir -p /tmp/${NAME}/etc/ cd ${__PROJECT__}/ -ldd ${__PROJECT__}/bin/swoole-cli.exe -v | grep -v '/cygdrive/' | awk '{print $3}' -ldd ${__PROJECT__}/bin/swoole-cli.exe -v | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/ +ldd ${__PROJECT__}/bin/swoole-cli.exe | grep -v '/cygdrive/' | awk '{print $3}' +ldd ${__PROJECT__}/bin/swoole-cli.exe | grep -v '/cygdrive/' | awk '{print $3}' | xargs -I {} cp {} /tmp/${NAME}/ ls -lh /tmp/${NAME}/ From 88c2fc55362c66db8711a2e83924cc704dec3351 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 12 Jan 2025 01:36:36 +0800 Subject: [PATCH 08/10] update cygwin-config-ext.sh --- sapi/scripts/cygwin/cygwin-config-ext.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 8fdb401ca3..02bd2abdf8 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -66,7 +66,20 @@ mkdir -p ${WORK_DIR}/ext/imagick/ tar --strip-components=1 -C ${WORK_DIR}/ext/imagick/ -xf imagick-${IMAGICK_VERSION}.tgz cd ${__PROJECT__} +# clean extension folder +NO_BUILT_IN_EXTENSIONS=$(ls ${WORK_DIR}/ext/) +for EXT_NAME in $NO_BUILT_IN_EXTENSIONS +do + echo "extnaion name: $EXT_NAME " + test -d ${__PROJECT__}/ext/${EXT_NAME} && rm -rf ${__PROJECT__}/ext/${EXT_NAME} +done + +cd ${__PROJECT__} +# copy extension # cp -rf var/cygwin-build/ext/* ext/ cp -rf ${WORK_DIR}/ext/* ${__PROJECT__}/ext/ +# extension hook + + cd ${__PROJECT__} From ff02d890d4c47a735c40060405db8f6aa91919eb Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 12 Jan 2025 01:43:12 +0800 Subject: [PATCH 09/10] update cygwin-config-ext.sh --- sapi/scripts/cygwin/cygwin-config-ext.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 02bd2abdf8..b1b8bd5043 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -70,7 +70,7 @@ cd ${__PROJECT__} NO_BUILT_IN_EXTENSIONS=$(ls ${WORK_DIR}/ext/) for EXT_NAME in $NO_BUILT_IN_EXTENSIONS do - echo "extnaion name: $EXT_NAME " + echo "EXTENSION_NAME: $EXT_NAME " test -d ${__PROJECT__}/ext/${EXT_NAME} && rm -rf ${__PROJECT__}/ext/${EXT_NAME} done From c391aaac81e7725b8c812ba77c492f20c61dcb5f Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 12 Jan 2025 10:38:19 +0800 Subject: [PATCH 10/10] update cygwin-config-ext.sh --- sapi/scripts/cygwin/cygwin-config-ext.sh | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index b1b8bd5043..a1d7dcd69e 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -20,20 +20,20 @@ mkdir -p pool/ext mkdir -p pool/lib mkdir -p pool/php-tar -WORK_DIR=${__PROJECT__}/var/cygwin-build/ -EXT_TEMP_CACHE_DIR=${WORK_DIR}/pool/ext/ -mkdir -p ${WORK_DIR} +WORK_TEMP_DIR=${__PROJECT__}/var/cygwin-build/ +EXT_TEMP_CACHE_DIR=${WORK_TEMP_DIR}/pool/ext/ +mkdir -p ${WORK_TEMP_DIR} mkdir -p ${EXT_TEMP_CACHE_DIR} -test -d ${WORK_DIR}/ext/ && rm -rf ${WORK_DIR}/ext/ -mkdir -p ${WORK_DIR}/ext/ +test -d ${WORK_TEMP_DIR}/ext/ && rm -rf ${WORK_TEMP_DIR}/ext/ +mkdir -p ${WORK_TEMP_DIR}/ext/ cd ${__PROJECT__}/pool/ext if [ ! -f redis-${REDIS_VERSION}.tgz ]; then curl -fSLo ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz https://pecl.php.net/get/redis-${REDIS_VERSION}.tgz mv ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz ${__PROJECT__}/pool/ext fi -mkdir -p ${WORK_DIR}/ext/redis/ -tar --strip-components=1 -C ${WORK_DIR}/ext/redis/ -xf redis-${REDIS_VERSION}.tgz +mkdir -p ${WORK_TEMP_DIR}/ext/redis/ +tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/redis/ -xf redis-${REDIS_VERSION}.tgz : <