Merge pull request #981 from jingjingxyk/experiment-feature

Experiment feature merge main code

Author: jingjingxyk

.github/workflows/windows-cygwin.yml

@@ -114,6 +114,7 @@ jobs:
           ./bin/swoole-cli -r "echo PHP_VERSION;"
           ldd ./bin/swoole-cli
           ./bin/swoole-cli -r "echo getcwd();echo PHP_EOL;"
+          ./bin/swoole-cli -r "echo getcwd(), PHP_EOL;"
 
       - name: get app version with bash
         # 参考 https://github.com/marketplace/actions/install-cygwin

sapi/scripts/cygwin/cygwin-config-ext.sh

@@ -29,6 +29,7 @@ REDIS_VERSION=5.3.7
 MONGODB_VERSION=1.14.2
 YAML_VERSION=2.2.2
 IMAGICK_VERSION=3.7.0
+SWOOLE_VERSION=$(awk 'NR==1{ print $1 }' "${__PROJECT__}/sapi/SWOOLE-VERSION.conf")
 
 mkdir -p pool/ext
 mkdir -p pool/lib
@@ -100,9 +101,10 @@ cd ${__PROJECT__}
 # copy extension
 # cp -rf var/cygwin-build/ext/* ext/
 cp -rf ${WORK_TEMP_DIR}/ext/. ${__PROJECT__}/ext/
+
+cd ${__PROJECT__}
 mkdir -p ${__PROJECT__}/ext/pgsql/
 cp -rf ${WORK_TEMP_DIR}/php-src/ext/pgsql/. ${__PROJECT__}/ext/pgsql/
 
 # extension hook
-
 cd ${__PROJECT__}

sapi/src/builder/extension/swoole.php

@@ -100,6 +100,7 @@
 
     $p->withExportVariable('ZSTD_CFLAGS', '$(pkg-config  --cflags --static  libzstd)');
     $p->withExportVariable('ZSTD_LIBS', '$(pkg-config    --libs   --static  libzstd)');
+
     /*
         $p->withBeforeConfigureScript('swoole', function () use ($p) {
             $workDir = $p->getWorkDir();

sapi/src/template/make.php

@@ -579,7 +579,7 @@
 	echo $LIBS
 elif [ "$1" = "sync" ] ;then
     PHP_CLI=$(which php)
-    test -f ${__PROJECT_DIR__}/runtime/php && PHP_CLI="${__PROJECT_DIR__}/runtime/php -d curl.cainfo=${__PROJECT_DIR__}/runtime/cacert.pem -d openssl.cafile=${__PROJECT_DIR__}/runtime/cacert.pem"
+    test -f ${__PROJECT_DIR__}/runtime/php/php && PHP_CLI="${__PROJECT_DIR__}/runtime/php/php -d curl.cainfo=${__PROJECT_DIR__}/runtime/php/cacert.pem -d openssl.cafile=${__PROJECT_DIR__}/runtime/php/cacert.pem"
     $PHP_CLI -v
     $PHP_CLI sync-source-code.php --action run
     exit 0