crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 12:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unify CGI deploy functions

Browse Source
This commit is contained in:
crazywhalecc 2025-10-25 03:03:40 +08:00
parent b59a06face
commit bab330b64e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SPC/builder/windows/WindowsBuilder.php
View File

@ -176,11 +176,7 @@ class WindowsBuilder extends BuilderBase
cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cgi_wrapper.bat --task-args php-cgi.exe"); cmd()->cd(SOURCE_PATH . '\php-src')->exec("{$this->sdk_prefix} nmake_cgi_wrapper.bat --task-args php-cgi.exe");
// deploy cgi binary $this->deployBinary(BUILD_TARGET_CGI);
logger()->info('Deploying cgi file');
FileSystem::createDir(BUILD_BIN_PATH);
cmd()->exec('copy ' . escapeshellarg(SOURCE_PATH . '\php-src\x64\Release' . ($this->zts ? '_TS' : '') . '\php-cgi.exe') . ' ' . escapeshellarg(BUILD_BIN_PATH . '\php-cgi.exe'));
} }
public function buildEmbed(): void public function buildEmbed(): void
@ -346,12 +342,13 @@ class WindowsBuilder extends BuilderBase
$src = match ($type) { $src = match ($type) {
BUILD_TARGET_CLI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php.exe", BUILD_TARGET_CLI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php.exe",
BUILD_TARGET_MICRO => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\micro.sfx", BUILD_TARGET_MICRO => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\micro.sfx",
BUILD_TARGET_CGI => SOURCE_PATH . "\\php-src\\x64\\Release{$ts}\\php-cgi.exe",
default => throw new SPCInternalException("Deployment does not accept type {$type}"), default => throw new SPCInternalException("Deployment does not accept type {$type}"),
}; };
// with-upx-pack for cli and micro // with-upx-pack for cli and micro
if ($this->getOption('with-upx-pack', false)) { if ($this->getOption('with-upx-pack', false)) {
if ($type === BUILD_TARGET_CLI || ($type === BUILD_TARGET_MICRO && version_compare($this->getMicroVersion(), '0.2.0') >= 0)) { if ($type === BUILD_TARGET_CLI || $type === BUILD_TARGET_CGI || ($type === BUILD_TARGET_MICRO && version_compare($this->getMicroVersion(), '0.2.0') >= 0)) {
cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src)); cmd()->exec(getenv('UPX_EXEC') . ' --best ' . escapeshellarg($src));
} }
} }

2
src/SPC/store/SourcePatcher.php
View File

@ -571,7 +571,7 @@ class SourcePatcher
*/ */
public static function patchWindowsCGITarget(): void public static function patchWindowsCGITarget(): void
{ {
// search Makefile code line contains "$(BUILD_DIR)\php.exe:" // search Makefile code line contains "$(BUILD_DIR)\php-cgi.exe:"
$content = FileSystem::readFile(SOURCE_PATH . '/php-src/Makefile'); $content = FileSystem::readFile(SOURCE_PATH . '/php-src/Makefile');
$lines = explode("\r\n", $content); $lines = explode("\r\n", $content);
$line_num = 0; $line_num = 0;