merge code

Author: jingjingxyk

.github/workflows/linux-aarch64.yml

@@ -107,7 +107,7 @@ jobs:
           mkdir -p bin/
           mkdir -p runtime/
           test -f runtime/php && rm -f runtime/php
-          if [ ! -f runtime/php/php ] ; then
+          if [ ! -f runtime/php/pie ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh

.github/workflows/linux-glibc.yml

@@ -85,7 +85,7 @@ jobs:
           mkdir -p bin/
           mkdir -p runtime/
           test -f runtime/php && rm -f runtime/php
-          if [ ! -f runtime/php/php ] ; then
+          if [ ! -f runtime/php/pie ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh
@@ -99,7 +99,7 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile
           composer dump-autoload --optimize --profile
 
-          php prepare.php --with-libavif
+          php prepare.php --with-libavif --without-docker
 
           sudo apt update
           bash ./sapi/scripts/install-deps-on-ubuntu.sh

.github/workflows/linux-x86_64.yml

@@ -154,7 +154,7 @@ jobs:
           mkdir -p bin/
           mkdir -p runtime/
           test -f runtime/php && rm -f runtime/php
-          if [ ! -f runtime/php/php ] ; then
+          if [ ! -f runtime/php/pie ] ; then
               bash  setup-php-runtime.sh
           fi
 

.github/workflows/macos-aarch64.yml

@@ -103,7 +103,7 @@ jobs:
           mkdir -p bin/
           mkdir -p runtime/
           test -f runtime/php && rm -f runtime/php
-          if [ ! -f runtime/php/php ] ; then
+          if [ ! -f runtime/php/pie ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh

.github/workflows/macos-x86_64.yml

@@ -116,7 +116,7 @@ jobs:
           mkdir -p bin/
           mkdir -p runtime/
           test -f runtime/php && rm -f runtime/php
-          if [ ! -f runtime/php/php ] ; then
+          if [ ! -f runtime/php/pie ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh

.github/workflows/windows-msys2.yml

@@ -63,7 +63,8 @@ jobs:
       - name: prepare build environment
         shell: msys2 {0}
         run: |
-          bash ./sapi/quickstart/windows/msys2-build/install-msys2.sh
+          bash sapi/quickstart/windows/msys2-build/install-msys2.sh
+          bash sapi/download-box/download-box-get-archive-from-server.sh
 
       - name: install deps lib with source code
         shell: msys2 {0}

prepare.php

@@ -90,9 +90,15 @@
 // Sync code from php-src
 $p->setPhpSrcDir($p->getWorkDir() . '/var/php-' . BUILD_PHP_VERSION);
 
+/*
+// Download swoole-src
+if (!is_dir(__DIR__ . '/ext/swoole')) {
+    //shell_exec(__DIR__ . '/sapi/scripts/download-swoole-src-archive.sh');
+}
+*/
 
 // Compile directly on the host machine, not in the docker container
-if ($p->getInputOption('without-docker') || ($p->isMacos())) {
+if ($p->getInputOption('without-docker') || ($p->isMacos()) || ($p->isLinux() && (!is_file('/.dockerenv')))) {
     $p->setWorkDir(__DIR__);
     $p->setBuildDir(__DIR__ . '/thirdparty');
 }
@@ -160,9 +166,13 @@
 
 if ($p->isMacos()) {
     //$p->setExtraLdflags('-undefined dynamic_lookup');
-    //$p->setExtraLdflags(' -framework CoreFoundation');
-    $p->setExtraLdflags(' ');
-    $homebrew_prefix = trim(shell_exec('brew --prefix'));
+    $p->setExtraLdflags('');
+    exec("brew --prefix 2>&1", $output, $result_code);
+    if ($result_code == 0) {
+        $homebrew_prefix = trim(implode(' ', $output));
+    } else {
+        $homebrew_prefix = "";
+    }
     $p->withBinPath($homebrew_prefix . '/opt/flex/bin')
         ->withBinPath($homebrew_prefix . '/opt/bison/bin')
         ->withBinPath($homebrew_prefix . '/opt/libtool/bin')

sapi/src/Extension.php

@@ -7,6 +7,9 @@ class Extension extends Project
     public string $options = '';
     public string $peclVersion = '';
 
+    public string $pieVersion = '';
+    public string $pieName = '';
+
     public array $dependentExtensions = [];
 
     public function withOptions(string $options): static
@@ -26,4 +29,17 @@ public function withDependentExtensions(string ...$extensions): static
         $this->dependentExtensions += $extensions;
         return $this;
     }
+
+    public function withPieVersion(string $pieVersion): static
+    {
+        $this->pieVersion = $pieVersion;
+        return $this;
+    }
+
+    public function withPieName(string $pieName): static
+    {
+        $this->pieName = $pieName;
+        return $this;
+    }
+
 }