imap ext fix

update spc binary php version
Fix dependency util suggest calculate bug (#441 )
2026-07-10 02:15:36 +08:00 · 2024-05-06 15:52:55 +08:00 · 2024-05-06 14:25:24 +08:00 · 2024-05-06 14:23:32 +08:00 · 2024-05-06 14:12:40 +08:00 · 2024-05-06 14:11:50 +08:00
15 changed files with 204 additions and 38 deletions
--- a/.github/workflows/build-windows-x86_64.yml
+++ b/.github/workflows/build-windows-x86_64.yml
@@ -0,0 +1,108 @@
+name: CI on x86_64 Windows
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: php version to compile
+        default: '8.2'
+        type: choice
+        options:
+          - '8.3'
+          - '8.2'
+          - '8.1'
+          - '8.0'
+          - '7.4'
+      build-cli:
+        description: build cli binary
+        default: true
+        type: boolean
+      build-micro:
+        description: build phpmicro binary
+        type: boolean
+      extensions:
+        description: extensions to compile (comma separated)
+        required: true
+        type: string
+      debug:
+        type: boolean
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    name: build ${{ inputs.version }} on Windows x86_64
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      # Cache composer dependencies
+      - id: cache-composer-deps
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: composer-dependencies
+
+      # If there's no Composer cache, install dependencies
+      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
+        run: composer update --no-dev --classmap-authoritative
+
+      - name: Generate hashed key for download cache
+        shell: bash
+        run: |
+          INPUT_HASH=$(echo "${{ runner.os }}-${{ inputs.version }}-${{ inputs.extensions }}" | sha256sum | awk '{print $1}')
+          echo "INPUT_HASH=${INPUT_HASH}" >> "$GITHUB_ENV"
+
+      # Cache downloaded source
+      - id: cache-download
+        uses: actions/cache@v4
+        with:
+          path: downloads
+          key: php-${{ env.INPUT_HASH }}
+
+      # With or without debug
+      - if: inputs.debug == true
+        run: echo "SPC_BUILD_DEBUG=--debug" >> $env:GITHUB_ENV
+
+      # With target select: cli, micro or both
+      - if: ${{ inputs.build-cli == true }}
+        run: echo "SPC_BUILD_CLI=--build-cli" >> $env:GITHUB_ENV
+      - if: ${{ inputs.build-micro == true }}
+        run: echo "SPC_BUILD_MICRO=--build-micro" >> $env:GITHUB_ENV
+
+      - run: ./bin/spc doctor
+
+      # If there's no dependencies cache, fetch sources, with or without debug
+      - if: steps.cache-download.outputs.cache-hit != 'true'
+        run: ./bin/spc download --with-php="${{ inputs.version }}" --for-extensions="${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }}
+
+      # Run build command
+      - run: ./bin/spc build "${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}
+
+      # Upload cli executable
+      - if: ${{ inputs.build-cli == true }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: php-${{ inputs.version }}
+          path: buildroot/bin/php.exe
+
+      # Upload micro self-extracted executable
+      - if: ${{ inputs.build-micro == true }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: micro-${{ inputs.version }}
+          path: buildroot/bin/micro.sfx
+
+      # Upload extensions metadata
+      - uses: actions/upload-artifact@v4
+        with:
+          name: license-files
+          path: buildroot/license/
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-meta
+          path: |
+            buildroot/build-extensions.json
+            buildroot/build-libraries.json
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -17,7 +17,7 @@ jobs:
        php-version:
          - "8.2"
        micro-version:
-          - "8.2.16"
+          - "8.2.18"
        operating-system:
          - "linux-x86_64"
          - "macos-x86_64"
--- a/README-zh.md
+++ b/README-zh.md
@@ -66,7 +66,7 @@ static-php-cli（简称 `spc`）有许多特性：
 |---------|----------------------|----------------------|
 | macOS   | :octocat: :computer: | :octocat: :computer: |
 | Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :computer:           |                      |
+| Windows | :octocat: :computer: |                      |
 | FreeBSD | :computer:           | :computer:           |

 当前支持编译的 PHP 版本：
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
 |---------|----------------------|----------------------|
 | macOS   | :octocat: :computer: | :octocat: :computer: |
 | Linux   | :octocat: :computer: | :octocat: :computer: |
-| Windows | :computer:           |                      |
+| Windows | :octocat: :computer: |                      |
 | FreeBSD | :computer:           | :computer:           |

 Currently supported PHP versions for compilation: 
--- a/config/ext.json
+++ b/config/ext.json
@@ -173,7 +173,7 @@
        "lib-depends": [
            "imap"
        ],
-        "lib-suggests": [
+        "ext-suggests": [
            "openssl"
        ]
    },
--- a/config/source.json
+++ b/config/source.json
@@ -480,13 +480,9 @@
        }
    },
    "ncurses": {
-        "alt": {
-            "type": "filelist",
-            "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
-            "regex": "/href=\"(?<file>ncurses-(?<version>[^\"]+)\\.tar\\.gz)\"/"
-        },
-        "type": "url",
-        "url": "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.4.tar.gz",
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
+        "regex": "/href=\"(?<file>ncurses-(?<version>[^\"]+)\\.tar\\.gz)\"/",
        "license": {
            "type": "file",
            "path": "COPYING"
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -145,7 +145,19 @@ class LinuxBuilder extends UnixBuilderBase
        ]);

        // upx pack and strip for micro
+        // but always restore Makefile.frag.bak first
+        if (file_exists(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak')) {
+            copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag');
+        }
        if ($this->getOption('with-upx-pack', false)) {
+            // judge $(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)` count
+            // if 2, replace src/globals/extra/micro-triple-Makefile.frag file content
+            if (substr_count(FileSystem::readFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag'), '$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`') === 2) {
+                // bak first
+                copy(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag.bak');
+                // replace Makefile.frag content
+                FileSystem::writeFile(SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag', FileSystem::readFile(ROOT_DIR . '/src/globals/extra/micro-triple-Makefile.frag'));
+            }
            // with upx pack always need strip
            FileSystem::replaceFileRegex(
                SOURCE_PATH . '/php-src/sapi/micro/Makefile.frag',
--- a/src/SPC/builder/macos/library/xz.php
+++ b/src/SPC/builder/macos/library/xz.php
@@ -1,20 +1,4 @@
 <?php
-/**
- * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
- *
- * lwmbs is licensed under Mulan PSL v2. You can use this
- * software according to the terms and conditions of the
- * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
- *
- * http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- *
- * See the Mulan PSL v2 for more details.
- */

 declare(strict_types=1);

--- a/src/SPC/builder/unix/library/ncurses.php
+++ b/src/SPC/builder/unix/library/ncurses.php
@@ -17,7 +17,7 @@ trait ncurses
                '--with-curses-h ' .
                '--enable-pc-files ' .
                '--enable-echo ' .
-                // '--enable-widec ' .
+                '--disable-widec ' .
                '--with-normal ' .
                '--with-ticlib ' .
                '--without-tests ' .
--- a/src/SPC/builder/unix/library/xz.php
+++ b/src/SPC/builder/unix/library/xz.php
@@ -20,7 +20,6 @@ trait xz
                './configure ' .
                '--enable-static ' .
                '--disable-shared ' .
-                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
                '--disable-scripts ' .
                '--disable-doc ' .
                '--with-libiconv ' .
--- a/src/SPC/command/BuildCliCommand.php
+++ b/src/SPC/command/BuildCliCommand.php
@@ -131,8 +131,8 @@ class BuildCliCommand extends BuildCommand
            if (!empty($not_included)) {
                $indent_texts['Extra Exts (' . count($not_included) . ')'] = implode(', ', $not_included);
            }
-            $this->printFormatInfo($indent_texts);
            $this->printFormatInfo($this->getDefinedEnvs(), true);
+            $this->printFormatInfo($indent_texts);
            logger()->notice('Build will start after 2s ...');
            sleep(2);

--- a/src/SPC/util/DependencyUtil.php
+++ b/src/SPC/util/DependencyUtil.php
@@ -62,12 +62,17 @@ class DependencyUtil

        if ($include_suggested_libs) {
            foreach ($dep_list as $name => $obj) {
+                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (!str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        array_splice($dep_list[$name]['suggests'], $id, 1);
+                        $del_list[] = $id;
                    }
                }
+                foreach ($del_list as $id) {
+                    unset($dep_list[$name]['suggests'][$id]);
+                }
+                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

@@ -93,12 +98,17 @@ class DependencyUtil
        if ($include_suggested_exts) {
            // check every deps suggests contains ext@
            foreach ($dep_list as $name => $obj) {
+                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        array_splice($dep_list[$name]['suggests'], $id, 1);
+                        $del_list[] = $id;
                    }
                }
+                foreach ($del_list as $id) {
+                    unset($dep_list[$name]['suggests'][$id]);
+                }
+                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

@@ -106,12 +116,17 @@ class DependencyUtil
        if ($include_suggested_libs) {
            // check every deps suggests
            foreach ($dep_list as $name => $obj) {
+                $del_list = [];
                foreach ($obj['suggests'] as $id => $suggest) {
                    if (!str_starts_with($suggest, 'ext@')) {
                        $dep_list[$name]['depends'][] = $suggest;
-                        array_splice($dep_list[$name]['suggests'], $id, 1);
+                        $del_list[] = $id;
                    }
                }
+                foreach ($del_list as $id) {
+                    unset($dep_list[$name]['suggests'][$id]);
+                }
+                $dep_list[$name]['suggests'] = array_values($dep_list[$name]['suggests']);
            }
        }

--- a/src/SPC/util/GlobalEnvManager.php
+++ b/src/SPC/util/GlobalEnvManager.php
@@ -80,7 +80,9 @@ class GlobalEnvManager
            self::initIfNotExists('CXX', "{$arch}-linux-musl-g++");
            self::initIfNotExists('AR', "{$arch}-linux-musl-ar");
            self::initIfNotExists('LD', 'ld.gold');
-            self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
+            if (getenv('SPC_NO_MUSL_PATH') !== 'yes') {
+                self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
+            }
        }

        // Init arch-specific cflags
@@ -106,12 +108,11 @@ class GlobalEnvManager
            'SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS'),
            'SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
            'SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS' => '-L' . BUILD_LIB_PATH,
-            'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread',
+            'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread -lm',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS' => $php_extra_cflags_optimize . ' -fno-ident -fPIE',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS' => '',
            'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM' => $clang_use_lld . '-all-static',
        ];
-
        foreach ($init_spc_cmd_maps as $name => $value) {
            self::initIfNotExists($name, $value);
        }
--- a/src/globals/extra/micro-triple-Makefile.frag
+++ b/src/globals/extra/micro-triple-Makefile.frag
@@ -0,0 +1,51 @@
+
+micro: $(SAPI_MICRO_PATH)
+
+micro_2s_objs:
+	rm $(MICRO_2STAGE_OBJS) || :
+	$(MAKE) $(MICRO_2STAGE_OBJS)
+
+EXTRA_MICRO_BUILD_COMMANDS=
+POST_MICRO_BUILD_COMMANDS=$(STRIP) $(MICRO_STRIP_FLAGS) $(SAPI_MICRO_PATH)
+
+$(SAPI_MICRO_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MICRO_OBJS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=0xcafebabe
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+	$(MAKE) micro_2s_objs SFX_FILESIZE=`$(STAT_SIZE) $(SAPI_MICRO_PATH)`
+	$(BUILD_MICRO)
+	$(EXTRA_MICRO_BUILD_COMMANDS)
+	$(POST_MICRO_BUILD_COMMANDS)
+
+MICRO_EXES = sapi/micro/tests/simpleecho.exe sapi/micro/tests/fakecmd.exe
+
+$(MICRO_EXES): $(SAPI_MICRO_PATH)
+	@binname=$@;\
+	cat $(SAPI_MICRO_PATH) $${binname%.exe}.php > $@ || {\
+		rm $@; \
+		exit 1; \
+	}
+	@chmod 0755 $@
+
+MICRO_FAKECMD=sapi/micro/tests/fakecmd.exe
+
+micro_test: $(SAPI_MICRO_PATH) $(MICRO_EXES)
+	@[ x"hello world" = "x`sapi/micro/tests/simpleecho.exe nonce world`" ] || {\
+		echo sanity check for micro.sfx failed, the sfx generated may be corrupt. >&2 ;\
+		exit 1;\
+	}
+	@SKIP_IO_CAPTURE_TESTS=yes \
+	TEST_PHP_EXECUTABLE=$(MICRO_FAKECMD) \
+	TEST_PHP_SRCDIR=$(top_srcdir) \
+	CC="$(CC)" \
+		$(MICRO_FAKECMD) -n $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n $(TESTS); \
+	exit $$?;
--- a/src/globals/test-extensions.php
+++ b/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' => 'readline',
+    'Linux', 'Darwin' => 'readline,pgsql,xml,dom,mbstring,mbregex,pdo_pgsql',
    'Windows' => 'mbstring,pdo_sqlite,mbregex',
 };

@@ -27,7 +27,7 @@ $with_libs = match (PHP_OS_FAMILY) {
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'minimal',
+    'Linux', 'Darwin' => 'none',
    'Windows' => 'none',
 };
Author	SHA1	Message	Date
crazywhalecc	e6c308c242	imap ext fix	2024-05-06 15:52:55 +08:00
crazywhalecc	3fcb7ebf03	update spc binary php version	2024-05-06 14:25:24 +08:00
Jerry Ma	7416b8079b	Fix dependency util suggest calculate bug (#441 ) * fix dependency util suggest calculate bug * fix dependency util suggest calculate bug	2024-05-06 14:23:32 +08:00
Jerry Ma	bde18054e5	Fix micro upx compress bug (#440 ) * triple compression for micro with upx * place debug info first	2024-05-06 14:12:40 +08:00
Jerry Ma	954f8f4ddc	fix ncurses 6.5 build (#439 )	2024-05-06 14:11:50 +08:00
Jerry Ma	0fee628842	Fix xz build on macOS and Linux (#438 ) * fix xz build * add xz tests	2024-05-06 12:55:38 +08:00
Jerry Ma	69e6d82e83	add linux env var: SPC_NO_MUSL_PATH (#437 )	2024-05-06 12:32:43 +08:00
crazywhalecc	e1e6270d86	update README	2024-05-06 12:08:35 +08:00
Simon Hamp	30af182aff	Windows build GitHub Action (#420 ) * Create build-windows-x86_64.yml * Update build-windows-x86_64.yml * Fix CLI param * Fix env writing in Powershell * Run doctor first, per docs * Fix file paths * Generate an acceptable cache key * Change shell * Improve cache key generation * Update upload-artifact action * Update actions * Attempt to fix cache key storage * Remove FPM build option	2024-05-06 11:59:02 +08:00