V3c/refactor pgo br (#1228)

Author: crazywhalecc

README-zh.md

@@ -3,16 +3,16 @@
 [![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
 [![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
-[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
-[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
+[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=v3&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/v3/LICENSE)
 [![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/xf6Rd4pEAk)
 
 **StaticPHP** 是一个强大的工具，用于构建可移植的可执行文件，包括 PHP、扩展等。
 
 > [!IMPORTANT]
-> 我们正准备发布 **v3** 版本，届时项目名称将从 **static-php-cli** 更改为 **StaticPHP**。
-> 此分支对应 v3 版本。v2 版本请查看 [v2 分支](https://github.com/crazywhalecc/static-php-cli/tree/main)。
-> 请更新您的参考资料，并关注正式版发布。
+> **v3** 是当前默认分支。项目名称现为 **StaticPHP**，仓库名保持 `static-php-cli` 不变。
+> v2 版本请查看 [v2 分支](https://github.com/crazywhalecc/static-php-cli/tree/main)。
+> 敬请关注正式版发布。
 
 ## 特性
 
@@ -40,15 +40,15 @@
 ### 1. 下载 spc 二进制
 
 ```bash
-# For Linux x86_64
+# Linux x86_64
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
+# Linux aarch64
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-aarch64
-# macOS x86_64 (Intel)
+# macOS x86_64（Intel）
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-x86_64
-# macOS aarch64 (Apple)
+# macOS aarch64（Apple）
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-aarch64
-# Windows (x86_64, win10 build 17063 or later, please install VS2022 first)
+# Windows（x86_64，需 Windows 10 build 17063 或更高版本，请先安装带 C++ 工具的 Visual Studio 2022）
 curl.exe -fsSL -o spc.exe https://dl.static-php.dev/v3/spc-bin/nightly/spc-windows-x64.exe
 ```
 
@@ -58,14 +58,17 @@ curl.exe -fsSL -o spc.exe https://dl.static-php.dev/v3/spc-bin/nightly/spc-windo
 chmod +x ./spc
 ```
 
+> [!TIP]
+> 建议在首次构建前运行 `./spc doctor --auto-fix`，检查并安装所需的构建依赖（必要时 spc 也会自动提醒你）。
+
 ### 2. 构建静态 PHP
 
 首先，创建 `craft.yml` 文件，并从 [扩展列表](https://static-php.dev/en/guide/extensions.html) 或 [命令生成器](https://static-php.dev/en/guide/cli-generator.html) 指定要包含的扩展：
 
 ```yml
-# PHP version support: 8.1, 8.2, 8.3, 8.4, 8.5, 8.6 (pre-release)
+# PHP 版本支持：8.1、8.2、8.3、8.4、8.5、8.6（预发布）
 php-version: 8.5
-# Put your extension list here
+# 在此填写你的扩展列表
 extensions: "apcu,bcmath,calendar,ctype,curl,dba,dom,exif,fileinfo,filter,gd,iconv,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,readline,redis,session,simplexml,sockets,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib"
 sapi:
   - cli
@@ -102,16 +105,26 @@ echo '<?php echo "Hello world!\n";' > a.php
 当前 README 包含基础用法。有关 StaticPHP 的完整功能集，
 请访问 <https://static-php.dev>。
 
+如果你从 v2 迁移，请参阅 [迁移指南](https://static-php.dev/zh/guide/migrate-from-v2.html)。
+
 ## 直接下载
 
-如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物，或从自托管服务器下载。
+如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/hosted/actions/workflows/v3-php-bin-unix.yml)（[Windows](https://github.com/static-php/hosted/actions/workflows/v3-php-bin-windows.yml)）下载示例预编译产物，或从自托管服务器下载。
 
-我们为每个 PHP 版本提供 2 种扩展集合：
+以下是几个具有不同扩展组合的预编译静态 PHP 二进制文件，
+你可以根据需要直接下载。
 
-- **gigantic**：尽可能包含更多扩展，二进制大小约 100-150MB。
-- **base**：仅包含 StaticPHP 自身使用的少量扩展，二进制大小约 10MB。
+| 组合名称                                                  | 扩展数量                                                    | 系统           | 备注                         |
+|-----------------------------------------------------------|-------------------------------------------------------------|----------------|------------------------------|
+| [common](https://dl.static-php.dev/v3/php-bin/common/)     | [37](https://dl.static-php.dev/v3/php-bin/common/README.txt)     | Linux, macOS | 二进制文件大小约为 13MB    |
+| [bulk](https://dl.static-php.dev/v3/php-bin/bulk/)         | [56](https://dl.static-php.dev/v3/php-bin/bulk/README.txt)       | Linux, macOS | 二进制文件大小约为 30MB    |
+| [gnu-bulk](https://dl.static-php.dev/v3/php-bin/gnu-bulk/) | [56](https://dl.static-php.dev/v3/php-bin/gnu-bulk/README.txt)   | Linux        | 使用共享 glibc             |
+| [minimal](https://dl.static-php.dev/v3/php-bin/minimal/)   | [7](https://dl.static-php.dev/v3/php-bin/minimal/README.txt)     | Linux, macOS | 二进制文件大小约为 3MB     |
+| [spc-min](https://dl.static-php.dev/v3/php-bin/spc-min/)   | [7](https://dl.static-php.dev/v3/php-bin/spc-min/README.txt)     | Windows      | 二进制文件大小约为 3MB     |
+| [spc-max](https://dl.static-php.dev/v3/php-bin/spc-max/)   | [50](https://dl.static-php.dev/v3/php-bin/spc-max/README.txt)    | Windows      | 二进制文件大小约为 9MB     |
 
-> WIP
+> Linux 和 Windows 二进制文件均经过 UPX 压缩，可以将二进制文件大小减少 30% 到 50%。
+> macOS 不支持 UPX 压缩，因此 mac 的预构建二进制文件大小较大。
 
 ### 在线构建（使用 GitHub Actions）
 
@@ -120,8 +133,8 @@ echo '<?php echo "Hello world!\n";' > a.php
 并同时自定义要编译的扩展列表。
 
 1. Fork 此仓库。
-2. 进入项目的 Actions 并选择 `CI`。
-3. 选择 `Run workflow`，填写你要编译的 PHP 版本、目标类型和扩展列表。（扩展用逗号分隔，例如 `bcmath,curl,mbstring`）
+2. 进入项目的 Actions 并选择 `CI on Unix`（Windows 构建请选择 `CI on x86_64 Windows`）。
+3. 选择 `Run workflow`，填写目标系统（`os`）、PHP 版本（`php-version`）和扩展列表（`extensions`，扩展用逗号分隔，例如 `bcmath,curl,mbstring`）。
 4. 等待工作流执行完成后，进入对应运行记录并下载 `Artifacts`。
 
 如果你启用 `debug`，构建时将输出所有日志，包括编译日志，便于排查问题。
@@ -146,6 +159,10 @@ echo '<?php echo "Hello world!\n";' > a.php
 
 <a href="https://nativephp.com/"><img src="/docs/public/images/nativephp-logo.svg" width="300" alt="NativePHP Logo" /></a>
 
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo" width="96" />
+
+**[JetBrains](https://github.com/JetBrains)** 为核心贡献者提供 <a href="https://www.jetbrains.com/community/opensource">开源开发许可证</a>
+
 ## 开源许可证
 
 本项目本身采用 MIT 许可证。

README.md

@@ -3,16 +3,16 @@
 [![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
 [![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
-[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
-[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
+[![CI](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=v3&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/v3/LICENSE)
 [![Discord](https://img.shields.io/discord/nrSRbpMJ?label=Discord&logo=discord&style=flat-square)](https://discord.gg/xf6Rd4pEAk)
 
 **StaticPHP** is a powerful tool designed for building portable executables including PHP, extensions, and more.
 
 > [!IMPORTANT]
-> We are preparing to release **v3**, which will include a project rename from **static-php-cli** to **StaticPHP**.
-> And this branch is for v3. For v2, please check the [v2 branch](https://github.com/crazywhalecc/static-php-cli/tree/main).
-> Please update your references and stay tuned for the official release.
+> **v3** is the current default branch. The project is now called **StaticPHP**, while the repository keeps its `static-php-cli` name.
+> For v2, please check the [v2 branch](https://github.com/crazywhalecc/static-php-cli/tree/main).
+> Stay tuned for the official release.
 
 ## Features
 
@@ -48,7 +48,7 @@ curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-aarch64
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
 curl -fsSL -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-macos-aarch64
-# Windows (x86_64, win10 build 17063 or later, please install VS2022 first)
+# Windows (x86_64, Windows 10 build 17063 or later, install Visual Studio 2022 with C++ tools first)
 curl.exe -fsSL -o spc.exe https://dl.static-php.dev/v3/spc-bin/nightly/spc-windows-x64.exe
 ```
 
@@ -58,6 +58,9 @@ For macOS and Linux, add execute permission first:
 chmod +x ./spc
 ```
 
+> [!TIP]
+> Before the first build, it is recommended to run `./spc doctor --auto-fix` to check and install the required build dependencies (spc will also remind you automatically when needed).
+
 ### 2. Build Static PHP
 
 First, create a `craft.yml` file and specify which extensions you want to include from [extension list](https://static-php.dev/en/guide/extensions.html) or [command generator](https://static-php.dev/en/guide/cli-generator.html):
@@ -102,16 +105,26 @@ echo '<?php echo "Hello world!\n";' > a.php
 The current README contains basic usage. For the complete feature set of StaticPHP,
 see <https://static-php.dev>.
 
+If you are migrating from v2, check out the [migration guide](https://static-php.dev/en/guide/migrate-from-v2.html).
+
 ## Direct Download
 
-If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
+If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/hosted/actions/workflows/v3-php-bin-unix.yml) ([Windows](https://github.com/static-php/hosted/actions/workflows/v3-php-bin-windows.yml)) or from a self-hosted server.
 
-We offer 2 types of extension sets for each PHP version:
+Below are several precompiled static-php binaries with different extension combinations,
+which can be downloaded directly according to your needs.
 
-- **gigantic**: Includes as many extensions as possible, the binary size is about 100-150MB.
-- **base**: Only includes a few extensions used by StaticPHP itself, the binary size is about 10MB.
+| Combination                                                | Extension Count                                                  | OS           | Comment                         |
+|------------------------------------------------------------|------------------------------------------------------------------|--------------|---------------------------------|
+| [common](https://dl.static-php.dev/v3/php-bin/common/)     | [37](https://dl.static-php.dev/v3/php-bin/common/README.txt)     | Linux, macOS | The binary size is about 13MB   |
+| [bulk](https://dl.static-php.dev/v3/php-bin/bulk/)         | [56](https://dl.static-php.dev/v3/php-bin/bulk/README.txt)       | Linux, macOS | The binary size is about 30MB   |
+| [gnu-bulk](https://dl.static-php.dev/v3/php-bin/gnu-bulk/) | [56](https://dl.static-php.dev/v3/php-bin/gnu-bulk/README.txt)   | Linux        | Using shared glibc              |
+| [minimal](https://dl.static-php.dev/v3/php-bin/minimal/)   | [7](https://dl.static-php.dev/v3/php-bin/minimal/README.txt)     | Linux, macOS | The binary size is about 3MB    |
+| [spc-min](https://dl.static-php.dev/v3/php-bin/spc-min/)   | [7](https://dl.static-php.dev/v3/php-bin/spc-min/README.txt)     | Windows      | The binary size is about 3MB    |
+| [spc-max](https://dl.static-php.dev/v3/php-bin/spc-max/)   | [50](https://dl.static-php.dev/v3/php-bin/spc-max/README.txt)    | Windows      | The binary size is about 9MB    |
 
-> WIP
+> Linux and Windows binaries are compressed with UPX, which can reduce the size of the binary by 30% to 50%.
+> macOS does not support UPX compression, so the size of the pre-built binaries for macOS is larger.
 
 ### Build Online (using GitHub Actions)
 
@@ -120,8 +133,8 @@ you can use GitHub Actions to easily build a statically compiled PHP
 while defining your own extension list.
 
 1. Fork this repository.
-2. Go to the Actions of the project and select `CI`.
-3. Select `Run workflow`, fill in the PHP version you want to compile, the target type, and the list of extensions. (extensions comma separated, e.g. `bcmath,curl,mbstring`)
+2. Go to the Actions of the project and select `CI on Unix` (or `CI on x86_64 Windows` for Windows builds).
+3. Select `Run workflow`, fill in the target OS (`os`), the PHP version (`php-version`), and the list of extensions (`extensions`, comma separated, e.g. `bcmath,curl,mbstring`).
 4. After waiting for the workflow to finish, open the corresponding run and download `Artifacts`.
 
 If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.

docs/.vitepress/components/Contributors.vue

@@ -59,7 +59,7 @@ const fetchContributors = async () => {
     error.value = '';
 
     const response = await fetch(
-      'https://api.github.com/repos/crazywhalecc/static-php-cli/contributors?per_page=24'
+      'https://api.github.com/repos/crazywhalecc/static-php-cli/contributors?per_page=50'
     );
 
     if (!response.ok) {

src/Package/Extension/rar.php

@@ -11,6 +11,7 @@
 use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\FileSystem;
+use StaticPHP\Util\SourcePatcher;
 
 #[Extension('rar')]
 class rar extends PhpExtensionPackage
@@ -24,4 +25,40 @@ public function patchBeforeBuildconf(): void
             FileSystem::replaceFileStr("{$this->getBuildDir()}/config.m4", '-Wall -fvisibility=hidden', '-Wall -Wno-incompatible-function-pointer-types -fvisibility=hidden');
         }
     }
+
+    /**
+     * php-rar 4.3.1+ GitHub release tarballs omit rar.map, but config.m4 probes
+     * and links every build with -Wl,--version-script=$ext_srcdir/rar.map. The
+     * configure probe links an executable, where ld.lld tolerates the missing
+     * file, so configure reports "yes" and the real shared-library link fails
+     * with "cannot find version script". Recreate the file (content matches
+     * upstream master) when missing, before configure on both the shared
+     * phpize path and the static in-tree path.
+     */
+    #[BeforeStage('ext-rar', [self::class, 'configureForUnix'])]
+    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-rar')]
+    #[PatchDescription('Recreate rar.map omitted from php-rar release tarballs but required by config.m4')]
+    public function patchMissingRarMap(): void
+    {
+        $mapFile = "{$this->getBuildDir()}/rar.map";
+        if (!file_exists($mapFile)) {
+            FileSystem::writeFile($mapFile, "{ global: get_module; local: *; };\n");
+        }
+    }
+
+    /**
+     * unrar's __builtin_cpu_supports() (GCC extension) resolves to __cpu_model at
+     * link time, which zig's compiler-rt does not provide, so static builds (and,
+     * with -z defs, shared ones) fail with "undefined symbol: __cpu_model".
+     * Patch both __GNUC__ fallbacks (unrar/system.cpp, unrar/rijndael.cpp) to
+     * __get_cpuid(), the same logic unrar already uses for _MSC_VER. Patch before
+     * configure on both the shared phpize path and the static in-tree path.
+     */
+    #[BeforeStage('ext-rar', [self::class, 'configureForUnix'])]
+    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-rar')]
+    #[PatchDescription('Replace unrar __builtin_cpu_supports with __get_cpuid for zig-cc static link compatibility')]
+    public function patchUnrarCpuDetectionForZig(): void
+    {
+        SourcePatcher::patchFile('rar_unrar_get_cpuid.patch', $this->getBuildDir());
+    }
 }