Merge pull request #339 from crazywhalecc/ext/gettext

Add gettext support

.github/workflows/release-build.yml

@@ -15,14 +15,15 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
         micro-version:
-          - "8.1.26"
+          - "8.2.16"
         operating-system:
           - "linux-x86_64"
           - "macos-x86_64"
           - "linux-aarch64"
           - "macos-aarch64"
+          - "windows-x64"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -59,31 +60,51 @@ jobs:
 
       - name: "Download minimal combination"
         run: |
-          curl https://dl.static-php.dev/static-php-cli/minimal/php-${{ matrix.micro-version }}-micro-${{ matrix.operating-system }}.tar.gz -o tmp.tgz
-          tar -zxvf tmp.tgz
-
+          if [ "${{ matrix.operating-system }}" = "windows-x64" ]; then
+            curl https://dl.static-php.dev/static-php-cli/windows/spc-min/php-${{ matrix.micro-version }}-micro-win.zip -o tmp.zip
+            unzip tmp.zip
+          else
+            curl https://dl.static-php.dev/static-php-cli/minimal/php-${{ matrix.micro-version }}-micro-${{ matrix.operating-system }}.tar.gz -o tmp.tgz
+            tar -zxvf tmp.tgz
+          fi
+          
       - name: "Generate Executable"
         run: |
-          cat micro.sfx spc.phar > spc
-          chmod +x spc
+          if [ "${{ matrix.operating-system }}" = "windows-x64" ]; then
+            cat micro.sfx spc.phar > spc.exe
+          else
+            cat micro.sfx spc.phar > spc
+            chmod +x spc
+          fi
 
       - name: "Archive Executable"
         run: |
-          tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
-          echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
-          echo "OS=${{ matrix.operating-system }}" >> $GITHUB_ENV
-          if [ "${{ matrix.operating-system }}" == "linux-x86_64" ]; then
-            ./spc dev:extensions
+          if [ "${{ matrix.operating-system }}" != "windows-x64" ]; then
+            tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
+            echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
+            echo "OS=${{ matrix.operating-system }}" >> $GITHUB_ENV
+            if [ "${{ matrix.operating-system }}" == "linux-x86_64" ]; then
+              ./spc dev:extensions
+            fi
+          else
+            echo "filename=spc-${{ matrix.operating-system }}.exe" >> $GITHUB_ENV
+            echo "OS=${{ matrix.operating-system }}" >> $GITHUB_ENV
           fi
 
       - name: "Copy file"
-        run: "mkdir dist/ && cp ${{ env.filename }} dist/ && cp spc dist/spc-$OS"
+        run: |
+          if [ "${{ matrix.operating-system }}" != "windows-x64" ]; then
+            mkdir dist/ && cp ${{ env.filename }} dist/ && cp spc dist/spc-$OS
+          else
+            mkdir dist/ && cp spc.exe dist/${{ env.filename }}
+            echo "SUFFIX=.exe" >> $GITHUB_ENV
+          fi
 
       - name: upload binaries to release
         uses: softprops/action-gh-release@v1
         if: ${{startsWith(github.ref, 'refs/tags/') }}
         with:
-          files: ${{ env.filename }}
+          files: dist/${{ env.filename }}
 
       - name: "Deploy to Self-Hosted Server"
         if: github.repository == 'crazywhalecc/static-php-cli'
@@ -100,5 +121,5 @@ jobs:
       - name: "Upload Artifact"
         uses: actions/upload-artifact@v3
         with:
-          path: spc
-          name: spc-${{ matrix.operating-system }}
+          path: spc${{ env.SUFFIX }}
+          name: spc-${{ matrix.operating-system }}${{ env.SUFFIX }}

README-zh.md

@@ -248,7 +248,7 @@ bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=sys
 
 ## 赞助本项目
 
-你可以在 [我的个人赞助页](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md) 支持我和我的项目。
+你可以在 [我的个人赞助页](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md) 支持我和我的项目。你捐赠的一部分将会被用于维护 **static-php.dev** 服务器。
 
 ## 开源协议
 

README.md

@@ -272,7 +272,7 @@ Now there is a [static-php](https://github.com/static-php) organization, which i
 
 ## Sponsor this project
 
-You can sponsor my project on [this page](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md).
+You can sponsor my project on [this page](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md). A portion of your donation will be used to maintain the **static-php.dev** server.
 
 ## Open-Source License
 

box.json

@@ -14,6 +14,5 @@
     "vendor/zhamao"
   ],
   "git-commit-short": "git_commit_short",
-  "metadata": "ConsoleApplication::VERSION",
   "output": "spc.phar"
 }

composer.json

@@ -19,10 +19,10 @@
         "captainhook/captainhook": "^5.10",
         "captainhook/plugin-composer": "^5.3",
         "friendsofphp/php-cs-fixer": "^3.25",
-        "humbug/box": "^4.3",
+        "humbug/box": "^4.5",
         "nunomaduro/collision": "^7.8",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.3"
+        "phpunit/phpunit": "^10.3 || ^9"
     },
     "autoload": {
         "psr-4": {

config/ext.json

@@ -93,6 +93,13 @@
             "freetype"
         ]
     },
+    "gettext": {
+        "type": "builtin",
+        "arg-type": "with-prefix",
+        "lib-depends": [
+            "gettext"
+        ]
+    },
     "glfw": {
         "type": "external",
         "arg-type": "custom",

config/lib.json

@@ -83,6 +83,22 @@
             "brotli"
         ]
     },
+    "gettext": {
+        "source": "gettext",
+        "static-libs-unix": [
+            "libintl.a"
+        ],
+        "lib-depends": [
+            "libiconv"
+        ],
+        "lib-suggests": [
+            "ncurses",
+            "libxml2"
+        ],
+        "frameworks": [
+            "CoreFoundation"
+        ]
+    },
     "glfw": {
         "source": "ext-glfw",
         "static-libs-unix": [

config/source.json

@@ -129,6 +129,15 @@
             "path": "LICENSE.TXT"
         }
     },
+    "gettext": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/pub/gnu/gettext/",
+        "regex": "/href=\"(?<file>gettext-(?<version>[^\"]+)\\.tar\\.xz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "gmp": {
         "type": "ghtagtar",
         "repo": "alisw/GMP",

src/SPC/ConsoleApplication.php

@@ -23,7 +23,7 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.1.0-beta.2';
+    public const VERSION = '2.1.0-beta.3';
 
     public function __construct()
     {

src/SPC/builder/Extension.php

@@ -185,8 +185,11 @@ class Extension
                 file_get_contents(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php')
             );
 
-            [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -r "' . trim($test) . '"');
+            [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -r "' . trim($test) . '"');
             if ($ret !== 0) {
+                if ($this->builder->getOption('debug')) {
+                    var_dump($out);
+                }
                 throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check');
             }
         }

src/SPC/builder/extension/gettext.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\builder\macos\MacOSBuilder;
+use SPC\exception\FileSystemException;
+use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('gettext')]
+class gettext extends Extension
+{
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuildconf(): bool
+    {
+        if ($this->builder instanceof MacOSBuilder) {
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gettext/config.m4', 'AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB(intl');
+        }
+        return true;
+    }
+
+    /**
+     * @throws WrongUsageException
+     * @throws FileSystemException
+     */
+    public function patchBeforeConfigure(): bool
+    {
+        if ($this->builder instanceof MacOSBuilder) {
+            $frameworks = ' ' . $this->builder->getFrameworks(true) . ' ';
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lintl', $this->getLibFilesString() . $frameworks);
+        }
+        return true;
+    }
+}

src/SPC/builder/linux/SystemUtil.php

@@ -110,11 +110,7 @@ class SystemUtil
     public static function getTuneCFlags(string $arch): array
     {
         return match ($arch) {
-            'x86_64' => [
-                '-march=corei7',
-                '-mtune=core-avx2',
-            ],
-            'arm64', 'aarch64' => [],
+            'x86_64', 'arm64', 'aarch64' => [],
             default => throw new RuntimeException('unsupported arch: ' . $arch),
         };
     }

src/SPC/builder/linux/library/gettext.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class gettext extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\gettext;
+
+    public const NAME = 'gettext';
+}

src/SPC/builder/linux/library/libxml2.php

@@ -18,7 +18,7 @@ class libxml2 extends LinuxLibraryBase
      */
     public function build(): void
     {
-        $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
+        $enable_zlib = $this->builder->getLib('zlib') ? ('ON -DZLIB_LIBRARY=' . BUILD_LIB_PATH . '/libz.a -DZLIB_INCLUDE_DIR=' . BUILD_INCLUDE_PATH) : 'OFF';
         $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 

src/SPC/builder/macos/library/gettext.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class gettext extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\gettext;
+
+    public const NAME = 'gettext';
+}

src/SPC/builder/macos/library/libxml2.php

@@ -18,7 +18,7 @@ class libxml2 extends MacOSLibraryBase
      */
     protected function build(): void
     {
-        $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
+        $enable_zlib = $this->builder->getLib('zlib') ? ('ON -DZLIB_LIBRARY=' . BUILD_LIB_PATH . '/libz.a -DZLIB_INCLUDE_DIR=' . BUILD_INCLUDE_PATH) : 'OFF';
         $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 

src/SPC/builder/unix/library/gettext.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+trait gettext
+{
+    protected function build(): void
+    {
+        $extra = $this->builder->getLib('ncurses') ? ('--with-libncurses-prefix=' . BUILD_ROOT_PATH . ' ') : '';
+        $extra .= $this->builder->getLib('libxml2') ? ('--with-libxml2-prefix=' . BUILD_ROOT_PATH . ' ') : '';
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                '--disable-java ' .
+                '--disable-c+ ' .
+                $extra .
+                '--with-libiconv-prefix=' . BUILD_ROOT_PATH . ' ' .
+                '--prefix=' . BUILD_ROOT_PATH
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install');
+    }
+}

src/SPC/command/BuildCliCommand.php

@@ -32,7 +32,7 @@ class BuildCliCommand extends BuildCommand
         $this->addOption('enable-zts', null, null, 'enable ZTS support');
         $this->addOption('disable-opcache-jit', null, null, 'disable opcache jit');
         $this->addOption('with-hardcoded-ini', 'I', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Patch PHP source code, inject hardcoded INI');
-        $this->addOption('with-micro-fake-cli', null, null, 'Enable phpmicro fake cli');
+        $this->addOption('with-micro-fake-cli', null, null, 'Let phpmicro\'s PHP_SAPI use "cli" instead of "micro"');
         $this->addOption('with-suggested-libs', 'L', null, 'Build with suggested libs for selected exts and libs');
         $this->addOption('with-suggested-exts', 'E', null, 'Build with suggested extensions for selected exts');
         $this->addOption('with-added-patch', 'P', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Inject patch script outside');

src/globals/test-extensions.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
+    'Linux', 'Darwin' => 'event,gettext',
     'Windows' => 'mbstring',
 };
 

src/globals/tests/gettext.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+assert(function_exists('gettext'));
+assert(function_exists('bindtextdomain'));
+assert(function_exists('textdomain'));
+assert(function_exists('bind_textdomain_codeset'));
+
+if (!is_dir('locale/en_US/LC_MESSAGES/')) {
+    mkdir('locale/en_US/LC_MESSAGES/', 0755, true);
+}
+if (!file_exists('locale/en_US/LC_MESSAGES/test.mo')) {
+    $mo = '3hIElQAAAAACAAAAHAAAACwAAAAFAAAAPAAAAAAAAABQAAAABgAAAFEAAAAXAQAAWAAAAAcAAABwAQAAAQAAAAAAAAAAAAAAAgAAAAAAAAAA56S65L6LAFByb2plY3QtSWQtVmVyc2lvbjogUEFDS0FHRSBWRVJTSU9OClJlcG9ydC1Nc2dpZC1CdWdzLVRvOiAKUE8tUmV2aXNpb24tRGF0ZTogWUVBUi1NTy1EQSBITzpNSStaT05FCkxhc3QtVHJhbnNsYXRvcjogRlVMTCBOQU1FIDxFTUFJTEBBRERSRVNTPgpMYW5ndWFnZS1UZWFtOiBMQU5HVUFHRSA8TExAbGkub3JnPgpMYW5ndWFnZTogCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CgBFeGFtcGxlAA==';
+    file_put_contents('locale/en_US/LC_MESSAGES/test.mo', base64_decode($mo));
+}
+putenv('LANG=en_US');
+setlocale(LC_ALL, 'en_US');
+
+$domain = 'test';
+bindtextdomain($domain, 'locale/');
+bind_textdomain_codeset($domain, 'UTF-8');
+textdomain($domain);
+
+assert(gettext(json_decode('"\u793a\u4f8b"', true)) === 'Example');