Merge remote-tracking branch 'origin/main' into zig

Author: henderkes

.github/workflows/tests.yml

@@ -190,7 +190,7 @@ jobs:
           echo "UPX_CMD=$(php src/globals/test-extensions.php upx)" >> $GITHUB_ENV
 
       - name: "Run Build Tests (download)"
-        run: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} php src/globals/test-extensions.php download_cmd ${{ matrix.os }} ${{ matrix.php }}
+        run: php src/globals/test-extensions.php download_cmd ${{ matrix.os }} ${{ matrix.php }}
 
       - name: "Run Build Tests (build)"
         run: php src/globals/test-extensions.php build_cmd ${{ matrix.os }} ${{ matrix.php }}

config/ext.json

@@ -304,12 +304,14 @@
     },
     "intl": {
         "support": {
-            "Windows": "no",
             "BSD": "wip"
         },
         "type": "builtin",
-        "lib-depends": [
+        "lib-depends-unix": [
             "icu"
+        ],
+        "lib-depends-windows": [
+            "icu-static-win"
         ]
     },
     "ldap": {
@@ -336,6 +338,9 @@
         },
         "type": "builtin",
         "arg-type": "none",
+        "ext-depends": [
+            "xml"
+        ],
         "target": [
             "static"
         ]

config/lib.json

@@ -207,6 +207,18 @@
             "libicudata.a"
         ]
     },
+    "icu-static-win": {
+        "source": "icu-static-win",
+        "static-libs-windows": [
+            "icudt.lib",
+            "icuin.lib",
+            "icuio.lib",
+            "icuuc.lib"
+        ],
+        "headers-windows": [
+            "unicode"
+        ]
+    },
     "imagemagick": {
         "source": "imagemagick",
         "static-libs-unix": [

config/source.json

@@ -342,6 +342,14 @@
             "path": "LICENSE"
         }
     },
+    "icu-static-win": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/icu-static-windows-x64/icu-static-windows-x64.zip",
+        "license": {
+            "type": "text",
+            "text": "none"
+        }
+    },
     "igbinary": {
         "type": "url",
         "url": "https://pecl.php.net/get/igbinary",

src/SPC/builder/extension/intl.php

@@ -5,6 +5,7 @@
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\builder\windows\WindowsBuilder;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -13,13 +14,15 @@ class intl extends Extension
 {
     public function patchBeforeBuildconf(): bool
     {
-        // TODO: remove the following line when https://github.com/php/php-src/pull/14002 will be released
-        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/intl/config.m4', 'PHP_CXX_COMPILE_STDCXX(11', 'PHP_CXX_COMPILE_STDCXX(17');
-        // Also need to use clang++ -std=c++17 to force override the default C++ standard
-        if (is_string($env = getenv('CXX')) && !str_contains($env, 'std=c++17')) {
-            f_putenv('CXX=' . $env . ' -std=c++17');
+        if ($this->builder instanceof WindowsBuilder) {
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/ext/intl/config.w32',
+                'EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true,',
+                'EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", PHP_INTL_SHARED,'
+            );
+            return true;
         }
-        return true;
+        return false;
     }
 
     public function patchBeforeSharedPhpize(): bool

src/SPC/builder/linux/LinuxBuilder.php

@@ -28,7 +28,7 @@ public function __construct(array $options = [])
         // check musl-cross make installed if we use musl-cross-make
         $arch = arch2gnu(php_uname('m'));
 
-        GlobalEnvManager::init($this);
+        GlobalEnvManager::init();
 
         if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist()) {
             $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");

src/SPC/builder/macos/MacOSBuilder.php

@@ -28,7 +28,7 @@ public function __construct(array $options = [])
         $this->options = $options;
 
         // apply global environment variables
-        GlobalEnvManager::init($this);
+        GlobalEnvManager::init();
 
         // ---------- set necessary compile vars ----------
         // concurrency

src/SPC/builder/windows/WindowsBuilder.php

@@ -33,7 +33,7 @@ public function __construct(array $options = [])
     {
         $this->options = $options;
 
-        GlobalEnvManager::init($this);
+        GlobalEnvManager::init();
 
         // ---------- set necessary options ----------
         // set sdk (require visual studio 16 or 17)

src/SPC/builder/windows/library/icu_static_win.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class icu_static_win extends WindowsLibraryBase
+{
+    public const NAME = 'icu-static-win';
+
+    protected function build(): void
+    {
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
+        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
+
+        // create libpq folder in buildroot/includes/libpq
+        if (!file_exists("{$this->getIncludeDir()}\\unicode")) {
+            mkdir("{$this->getIncludeDir()}\\unicode");
+        }
+
+        FileSystem::copyDir("{$this->source_dir}\\x64-windows-static\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
+    }
+}

src/SPC/command/DeleteDownloadCommand.php

@@ -22,6 +22,8 @@ public function configure(): void
     {
         $this->addArgument('sources', InputArgument::REQUIRED, 'The sources/packages will be deleted, comma separated');
         $this->addOption('all', 'A', null, 'Delete all downloaded and locked sources/packages');
+        $this->addOption('pre-built-only', 'W', null, 'Delete only pre-built sources/packages, not the original ones');
+        $this->addOption('source-only', 'S', null, 'Delete only sources, not the pre-built packages');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output): void
@@ -51,10 +53,11 @@ public function handle(): int
             $deleted_sources = [];
             foreach ($chosen_sources as $source) {
                 $source = trim($source);
-                foreach ([$source, Downloader::getPreBuiltLockName($source)] as $name) {
-                    if (LockFile::get($name)) {
-                        $deleted_sources[] = $name;
-                    }
+                if (LockFile::get($source) && !$this->getOption('pre-built-only')) {
+                    $deleted_sources[] = $source;
+                }
+                if (LockFile::get(Downloader::getPreBuiltLockName($source)) && !$this->getOption('source-only')) {
+                    $deleted_sources[] = Downloader::getPreBuiltLockName($source);
                 }
             }