From 05b37232d3e9f8ff99a9b7f00d89fa5545a801a1 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 14:10:40 +0800 Subject: [PATCH 1/9] swow --- sapi/scripts/cygwin/cygwin-config-swow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/scripts/cygwin/cygwin-config-swow.sh b/sapi/scripts/cygwin/cygwin-config-swow.sh index 95bc821cf9..3eea638a35 100644 --- a/sapi/scripts/cygwin/cygwin-config-swow.sh +++ b/sapi/scripts/cygwin/cygwin-config-swow.sh @@ -25,7 +25,7 @@ cd ${__PROJECT__}/php-src/ ./buildconf --force test -f Makefile && make clean -./configure --prefix=/usr --disable-all --disable-fiber-asm --with-curl --enable-swow --enable-swow-ssl --enable-swow-curl +./configure --prefix=/usr --disable-all --disable-fiber-asm --with-curl --enable-swow --enable-swow-ssl --enable-swow-curl --enable-swow-pdo-pgsql # ./configure --prefix=/usr --disable-all \ # --disable-fiber-asm \ From 2f5634dd08b35b314c48a24a19c865a34401db38 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 14:33:40 +0800 Subject: [PATCH 2/9] swow --- ...s-cygwin.yml => windows-cygwin-swoole.yml} | 0 .github/workflows/windows-cygwin-swow.yml | 1 + sapi/scripts/cygwin/cygwin-config-ext.sh | 40 ++++++++++++------- 3 files changed, 26 insertions(+), 15 deletions(-) rename .github/workflows/{windows-cygwin.yml => windows-cygwin-swoole.yml} (100%) diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin-swoole.yml similarity index 100% rename from .github/workflows/windows-cygwin.yml rename to .github/workflows/windows-cygwin-swoole.yml diff --git a/.github/workflows/windows-cygwin-swow.yml b/.github/workflows/windows-cygwin-swow.yml index 18ef608470..6113697add 100644 --- a/.github/workflows/windows-cygwin-swow.yml +++ b/.github/workflows/windows-cygwin-swow.yml @@ -5,6 +5,7 @@ on: env: BUILD_PHP_VERSION: 8.2.4 + BUILD_SWOW_VERSION: 1.3.1 jobs: windows-cygwin: diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 9e4351bf71..67d8fabfae 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -18,8 +18,14 @@ REDIS_VERSION=5.3.7 MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 -SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} -SWOW_VERSION=1.3.1 + +if [[ -n $BUILD_SWOOLE_VERSION ]];then + SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} +fi + +if [[ -n $BUILD_SWOW_VERSION ]];then + SWOW_VERSION=${BUILD_SWOW_VERSION} +fi if [ ! -d pool/ext ]; then mkdir -p pool/ext @@ -64,21 +70,25 @@ if [ ! -d $ROOT/ext/imagick ]; then mv imagick-${IMAGICK_VERSION} $ROOT/ext/imagick fi -if [ ! -d $ROOT/ext/swoole ]; then - if [ ! -f swoole-${SWOOLE_VERSION}.tgz ]; then - wget -O swoole-${SWOOLE_VERSION}.tgz https://github.com/swoole/swoole-src/archive/refs/tags/${SWOOLE_VERSION}.tar.gz - fi - mkdir -p swoole-${SWOOLE_VERSION} - tar --strip-components=1 -C swoole-${SWOOLE_VERSION} -xf swoole-${SWOOLE_VERSION}.tgz - mv swoole-${SWOOLE_VERSION} $ROOT/ext/swoole +if [[ -n ${SWOOLE_VERSION+set} ]];then + if [ ! -d $ROOT/ext/swoole ]; then + if [ ! -f swoole-${SWOOLE_VERSION}.tgz ]; then + wget -O swoole-${SWOOLE_VERSION}.tgz https://github.com/swoole/swoole-src/archive/refs/tags/${SWOOLE_VERSION}.tar.gz + fi + mkdir -p swoole-${SWOOLE_VERSION} + tar --strip-components=1 -C swoole-${SWOOLE_VERSION} -xf swoole-${SWOOLE_VERSION}.tgz + mv swoole-${SWOOLE_VERSION} $ROOT/ext/swoole + fi fi -if [ ! -d $ROOT/ext/swow ]; then - if [ ! -f swow-${SWOW_VERSION}.tar.gz ]; then - wget -O swow-${SWOW_VERSION}.tgz https://github.com/swow/swow/archive/refs/tags/v${SWOW_VERSION}.tar.gz - fi - tar xvf swow-${SWOW_VERSION}.tgz - mv swow-${SWOW_VERSION}/ext/ $ROOT/ext/swow +if [[ -n ${SWOW_VERSION+set} ]];then + if [ ! -d $ROOT/ext/swow ]; then + if [ ! -f swow-${SWOW_VERSION}.tar.gz ]; then + wget -O swow-${SWOW_VERSION}.tgz https://github.com/swow/swow/archive/refs/tags/v${SWOW_VERSION}.tar.gz + fi + tar xvf swow-${SWOW_VERSION}.tgz + mv swow-${SWOW_VERSION}/ext/ $ROOT/ext/swow + fi fi cd $ROOT From 590c3c6a1a7699d7f194f5b9a179452fe3656407 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 14:58:38 +0800 Subject: [PATCH 3/9] swow --- sapi/scripts/cygwin/cygwin-config-ext.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 67d8fabfae..340a9a7ae6 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -19,12 +19,12 @@ MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 -if [[ -n $BUILD_SWOOLE_VERSION ]];then - SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} +if [[ -n "$BUILD_SWOOLE_VERSION" ]];then +SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} fi -if [[ -n $BUILD_SWOW_VERSION ]];then - SWOW_VERSION=${BUILD_SWOW_VERSION} +if [[ -n "$BUILD_SWOW_VERSION" ]];then +SWOW_VERSION=${BUILD_SWOW_VERSION} fi if [ ! -d pool/ext ]; then @@ -70,7 +70,7 @@ if [ ! -d $ROOT/ext/imagick ]; then mv imagick-${IMAGICK_VERSION} $ROOT/ext/imagick fi -if [[ -n ${SWOOLE_VERSION+set} ]];then +if [[ -n "${SWOOLE_VERSION}" ]];then if [ ! -d $ROOT/ext/swoole ]; then if [ ! -f swoole-${SWOOLE_VERSION}.tgz ]; then wget -O swoole-${SWOOLE_VERSION}.tgz https://github.com/swoole/swoole-src/archive/refs/tags/${SWOOLE_VERSION}.tar.gz @@ -81,7 +81,7 @@ if [[ -n ${SWOOLE_VERSION+set} ]];then fi fi -if [[ -n ${SWOW_VERSION+set} ]];then +if [[ -n "${SWOW_VERSION}" ]];then if [ ! -d $ROOT/ext/swow ]; then if [ ! -f swow-${SWOW_VERSION}.tar.gz ]; then wget -O swow-${SWOW_VERSION}.tgz https://github.com/swow/swow/archive/refs/tags/v${SWOW_VERSION}.tar.gz From 17e1decfc38336a5423c11c2cbd87fafaa06ed25 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 15:17:02 +0800 Subject: [PATCH 4/9] swow --- sapi/scripts/cygwin/cygwin-config-ext.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 340a9a7ae6..4e3fc9a058 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -19,12 +19,16 @@ MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 -if [[ -n "$BUILD_SWOOLE_VERSION" ]];then +if test -z "$BUILD_SWOOLE_VERSION"; then +SWOOLE_VERSION="" +else SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} fi -if [[ -n "$BUILD_SWOW_VERSION" ]];then -SWOW_VERSION=${BUILD_SWOW_VERSION} +if test -z "$BUILD_SWOW_VERSION"; then +SWOW_VERSION="" +else +SWOW_VERSION=v${BUILD_SWOW_VERSION} fi if [ ! -d pool/ext ]; then From 4c273c74195c32e85d833848ea0d234cdfe770e0 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 15:45:15 +0800 Subject: [PATCH 5/9] swow --- .github/workflows/windows-cygwin-swow.yml | 1 + sapi/scripts/cygwin/cygwin-config-ext.sh | 18 ++---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows-cygwin-swow.yml b/.github/workflows/windows-cygwin-swow.yml index 6113697add..ee55d4c9ab 100644 --- a/.github/workflows/windows-cygwin-swow.yml +++ b/.github/workflows/windows-cygwin-swow.yml @@ -5,6 +5,7 @@ on: env: BUILD_PHP_VERSION: 8.2.4 + BUILD_SWOOLE_VERSION: 4.8.13 BUILD_SWOW_VERSION: 1.3.1 jobs: diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh index 4e3fc9a058..c782682b34 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -18,18 +18,8 @@ REDIS_VERSION=5.3.7 MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 - -if test -z "$BUILD_SWOOLE_VERSION"; then -SWOOLE_VERSION="" -else SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} -fi - -if test -z "$BUILD_SWOW_VERSION"; then -SWOW_VERSION="" -else SWOW_VERSION=v${BUILD_SWOW_VERSION} -fi if [ ! -d pool/ext ]; then mkdir -p pool/ext @@ -74,25 +64,21 @@ if [ ! -d $ROOT/ext/imagick ]; then mv imagick-${IMAGICK_VERSION} $ROOT/ext/imagick fi -if [[ -n "${SWOOLE_VERSION}" ]];then - if [ ! -d $ROOT/ext/swoole ]; then +if [ ! -d $ROOT/ext/swoole ]; then if [ ! -f swoole-${SWOOLE_VERSION}.tgz ]; then wget -O swoole-${SWOOLE_VERSION}.tgz https://github.com/swoole/swoole-src/archive/refs/tags/${SWOOLE_VERSION}.tar.gz fi mkdir -p swoole-${SWOOLE_VERSION} tar --strip-components=1 -C swoole-${SWOOLE_VERSION} -xf swoole-${SWOOLE_VERSION}.tgz mv swoole-${SWOOLE_VERSION} $ROOT/ext/swoole - fi fi -if [[ -n "${SWOW_VERSION}" ]];then - if [ ! -d $ROOT/ext/swow ]; then +if [ ! -d $ROOT/ext/swow ]; then if [ ! -f swow-${SWOW_VERSION}.tar.gz ]; then wget -O swow-${SWOW_VERSION}.tgz https://github.com/swow/swow/archive/refs/tags/v${SWOW_VERSION}.tar.gz fi tar xvf swow-${SWOW_VERSION}.tgz mv swow-${SWOW_VERSION}/ext/ $ROOT/ext/swow - fi fi cd $ROOT From 5e284a580b3f979a6d081864b3e0aed99ef04e59 Mon Sep 17 00:00:00 2001 From: wenjie Date: Mon, 14 Aug 2023 16:12:35 +0800 Subject: [PATCH 6/9] swow --- 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 c782682b34..9a87cfa032 100644 --- a/sapi/scripts/cygwin/cygwin-config-ext.sh +++ b/sapi/scripts/cygwin/cygwin-config-ext.sh @@ -19,7 +19,7 @@ MONGODB_VERSION=1.14.2 YAML_VERSION=2.2.2 IMAGICK_VERSION=3.7.0 SWOOLE_VERSION=v${BUILD_SWOOLE_VERSION} -SWOW_VERSION=v${BUILD_SWOW_VERSION} +SWOW_VERSION=${BUILD_SWOW_VERSION} if [ ! -d pool/ext ]; then mkdir -p pool/ext From 88423efff92583f23493895551313b7f80d21750 Mon Sep 17 00:00:00 2001 From: wenjie Date: Tue, 15 Aug 2023 08:32:24 +0800 Subject: [PATCH 7/9] update --- sapi/scripts/cygwin/cygwin-config-swow.sh | 86 +++++++++++------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/sapi/scripts/cygwin/cygwin-config-swow.sh b/sapi/scripts/cygwin/cygwin-config-swow.sh index 3eea638a35..5ed86a7794 100644 --- a/sapi/scripts/cygwin/cygwin-config-swow.sh +++ b/sapi/scripts/cygwin/cygwin-config-swow.sh @@ -25,50 +25,50 @@ cd ${__PROJECT__}/php-src/ ./buildconf --force test -f Makefile && make clean -./configure --prefix=/usr --disable-all --disable-fiber-asm --with-curl --enable-swow --enable-swow-ssl --enable-swow-curl --enable-swow-pdo-pgsql +# ./configure --prefix=/usr --disable-all --disable-fiber-asm --with-curl --enable-swow --enable-swow-ssl --enable-swow-curl --enable-swow-pdo-pgsql -# ./configure --prefix=/usr --disable-all \ -# --disable-fiber-asm \ -# --enable-opcache \ -# --without-pcre-jit \ -# --with-openssl --enable-openssl \ -# --with-curl \ -# --with-iconv \ -# --enable-intl \ -# --with-bz2 \ -# --enable-bcmath \ -# --enable-filter \ -# --enable-session \ -# --enable-tokenizer \ -# --enable-mbstring \ -# --enable-ctype \ -# --with-zlib \ -# --enable-posix \ -# --enable-sockets \ -# --enable-pdo \ -# --with-sqlite3 \ -# --enable-phar \ -# --enable-pcntl \ -# --enable-mysqlnd \ -# --with-mysqli \ -# --enable-fileinfo \ -# --with-pdo_mysql \ -# --with-pdo-sqlite \ -# --enable-soap \ -# --with-xsl \ -# --with-gmp \ -# --enable-exif \ -# --with-sodium \ -# --enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \ -# --enable-gd --with-jpeg --with-freetype \ -# --enable-swow --enable-swow-ssl --enable-swow-curl \ -# --enable-redis \ -# --with-imagick \ -# --with-yaml \ -# --with-readline \ -# --with-pdo-pgsql \ -# --with-pgsql \ -# --with-ffi +./configure --prefix=/usr --disable-all \ + --disable-fiber-asm \ + --enable-opcache \ + --without-pcre-jit \ + --with-openssl --enable-openssl \ + --with-curl \ + --with-iconv \ + --enable-intl \ + --with-bz2 \ + --enable-bcmath \ + --enable-filter \ + --enable-session \ + --enable-tokenizer \ + --enable-mbstring \ + --enable-ctype \ + --with-zlib \ + --enable-posix \ + --enable-sockets \ + --enable-pdo \ + --with-sqlite3 \ + --enable-phar \ + --enable-pcntl \ + --enable-mysqlnd \ + --with-mysqli \ + --enable-fileinfo \ + --with-pdo_mysql \ + --with-pdo-sqlite \ + --enable-soap \ + --with-xsl \ + --with-gmp \ + --enable-exif \ + --with-sodium \ + --enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \ + --enable-gd --with-jpeg --with-freetype \ + --enable-swow --enable-swow-ssl --enable-swow-curl \ + --enable-redis \ + --with-imagick \ + --with-yaml \ + --with-readline \ + --with-pdo-pgsql \ + --with-pgsql \ + --with-ffi # --with-zip # cygwin libzip-devel 版本库暂不支持函数 zip_encryption_method_supported (2020年新增函数) From 55f851e7c1c7fcdefa718b1117d803b3d8a952f6 Mon Sep 17 00:00:00 2001 From: wenjie Date: Tue, 15 Aug 2023 08:33:19 +0800 Subject: [PATCH 8/9] update --- sapi/scripts/cygwin/cygwin-config-swow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/scripts/cygwin/cygwin-config-swow.sh b/sapi/scripts/cygwin/cygwin-config-swow.sh index 5ed86a7794..341ee9335f 100644 --- a/sapi/scripts/cygwin/cygwin-config-swow.sh +++ b/sapi/scripts/cygwin/cygwin-config-swow.sh @@ -61,7 +61,7 @@ test -f Makefile && make clean --with-sodium \ --enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \ --enable-gd --with-jpeg --with-freetype \ - --enable-swow --enable-swow-ssl --enable-swow-curl \ + --enable-swow --enable-swow-ssl --enable-swow-curl --enable-swow-pdo-pgsql \ --enable-redis \ --with-imagick \ --with-yaml \ From 9c4e573fb143cae7862ba2046c2c7e09613bbb50 Mon Sep 17 00:00:00 2001 From: wenjie Date: Tue, 15 Aug 2023 17:54:06 +0800 Subject: [PATCH 9/9] update --- .github/workflows/windows-cygwin-swow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-cygwin-swow.yml b/.github/workflows/windows-cygwin-swow.yml index ee55d4c9ab..bf6a33fd00 100644 --- a/.github/workflows/windows-cygwin-swow.yml +++ b/.github/workflows/windows-cygwin-swow.yml @@ -39,7 +39,7 @@ jobs: uses: cygwin/cygwin-install-action@v4 with: platform: x86_64 - packages: make git curl wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel liblz4-devel liblzma-devel libzip-devel libicu-devel libonig-devel libcares-devel libsodium-devel libyaml-devel libMagick-devel libzstd-devel libbrotli-devel libreadline-devel libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils openssl-devel zip unzip libpq5 libpq-devel libffi-devel + packages: make git curl wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel liblz4-devel liblzma-devel libzip-devel libicu-devel libonig-devel libcares-devel libsodium-devel libyaml-devel libMagick-devel libzstd-devel libbrotli-devel libreadline-devel libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils openssl-devel zip unzip libpq5 libffi-devel libuv-devel libuv - name: Install re2c run: |