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

rename go-mod-frankenphp to go-xcaddy

Browse Source
This commit is contained in:
DubbleClick 2025-06-19 12:07:22 +07:00
parent a0047e3ad7
commit fbd6360bda
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/pkg.json
View File

@ -43,16 +43,16 @@
"upx-*-win64/upx.exe": "{pkg_root_path}/bin/upx.exe" "upx-*-win64/upx.exe": "{pkg_root_path}/bin/upx.exe"
} }
}, },
"go-mod-frankenphp-x86_64-linux": { "go-xcaddy-x86_64-linux": {
"type": "custom" "type": "custom"
}, },
"go-mod-frankenphp-aarch64-linux": { "go-xcaddy-aarch64-linux": {
"type": "custom" "type": "custom"
}, },
"go-mod-frankenphp-x86_64-macos": { "go-xcaddy-x86_64-macos": {
"type": "custom" "type": "custom"
}, },
"go-mod-frankenphp-aarch64-macos": { "go-xcaddy-aarch64-macos": {
"type": "custom" "type": "custom"
} }
} }

6
src/SPC/builder/BuilderBase.php
View File

@ -520,11 +520,11 @@ abstract class BuilderBase
if (!in_array(PHP_OS_FAMILY, ['Linux', 'Darwin'])) { if (!in_array(PHP_OS_FAMILY, ['Linux', 'Darwin'])) {
throw new WrongUsageException('FrankenPHP SAPI is only available on Linux and macOS!'); throw new WrongUsageException('FrankenPHP SAPI is only available on Linux and macOS!');
} }
// frankenphp needs package go-mod-frankenphp installed // frankenphp needs package go-xcaddy installed
$pkg_dir = PKG_ROOT_PATH . '/go-mod-frankenphp-' . arch2gnu(php_uname('m')) . '-' . osfamily2shortname(); $pkg_dir = PKG_ROOT_PATH . '/go-xcaddy-' . arch2gnu(php_uname('m')) . '-' . osfamily2shortname();
if (!file_exists("{$pkg_dir}/bin/go") || !file_exists("{$pkg_dir}/bin/xcaddy")) { if (!file_exists("{$pkg_dir}/bin/go") || !file_exists("{$pkg_dir}/bin/xcaddy")) {
global $argv; global $argv;
throw new WrongUsageException("FrankenPHP SAPI requires go-mod-frankenphp package, please install it first: {$argv[0]} install-pkg go-mod-frankenphp"); throw new WrongUsageException("FrankenPHP SAPI requires the go-xcaddy package, please install it first: {$argv[0]} install-pkg go-xcaddy");
} }
// frankenphp needs libxml2 lib on macos, see: https://github.com/php/frankenphp/blob/main/frankenphp.go#L17 // frankenphp needs libxml2 lib on macos, see: https://github.com/php/frankenphp/blob/main/frankenphp.go#L17
if (PHP_OS_FAMILY === 'Darwin' && !$this->getLib('libxml2')) { if (PHP_OS_FAMILY === 'Darwin' && !$this->getLib('libxml2')) {

8
src/SPC/builder/unix/UnixBuilderBase.php
View File

@ -311,7 +311,7 @@ abstract class UnixBuilderBase extends BuilderBase
$arch = arch2gnu(php_uname('m')); $arch = arch2gnu(php_uname('m'));
// define executables for go and xcaddy // define executables for go and xcaddy
$xcaddy_exec = PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}/bin/xcaddy"; $xcaddy_exec = PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin/xcaddy";
$nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : ''; $nobrotli = $this->getLib('brotli') === null ? ',nobrotli' : '';
$nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : ''; $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
@ -342,9 +342,9 @@ abstract class UnixBuilderBase extends BuilderBase
$config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list, with_dependencies: true); $config = (new SPCConfigUtil($this))->config($this->ext_list, $this->lib_list, with_dependencies: true);
$env = [ $env = [
'PATH' => PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}/bin:" . getenv('PATH'), 'PATH' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin:" . getenv('PATH'),
'GOROOT' => PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}", 'GOROOT' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}",
'GOBIN' => PKG_ROOT_PATH . "/go-mod-frankenphp-{$arch}-{$os}/bin", 'GOBIN' => PKG_ROOT_PATH . "/go-xcaddy-{$arch}-{$os}/bin",
'GOPATH' => PKG_ROOT_PATH . '/go', 'GOPATH' => PKG_ROOT_PATH . '/go',
'CGO_ENABLED' => '1', 'CGO_ENABLED' => '1',
'CGO_CFLAGS' => $config['cflags'], 'CGO_CFLAGS' => $config['cflags'],

6
src/SPC/command/CraftCommand.php
View File

@ -68,10 +68,10 @@ class CraftCommand extends BaseCommand
} }
// install go and xcaddy for frankenphp // install go and xcaddy for frankenphp
if (in_array('frankenphp', $craft['sapi'])) { if (in_array('frankenphp', $craft['sapi'])) {
$retcode = $this->runCommand('install-pkg', 'go-mod-frankenphp'); $retcode = $this->runCommand('install-pkg', 'go-xcaddy');
if ($retcode !== 0) { if ($retcode !== 0) {
$this->output->writeln('<error>craft go-mod-frankenphp failed</error>'); $this->output->writeln('<error>craft go-xcaddy failed</error>');
$this->log("craft go-mod-frankenphp failed with code: {$retcode}", true); $this->log("craft go-xcaddy failed with code: {$retcode}", true);
return static::FAILURE; return static::FAILURE;
} }
} }

10
src/SPC/store/pkg/GoModFrankenphp.php → src/SPC/store/pkg/GoXcaddy.php
View File

@ -9,15 +9,15 @@ use SPC\store\FileSystem;
use SPC\store\LockFile; use SPC\store\LockFile;
use SPC\util\GlobalEnvManager; use SPC\util\GlobalEnvManager;
class GoModFrankenphp extends CustomPackage class GoXcaddy extends CustomPackage
{ {
public function getSupportName(): array public function getSupportName(): array
{ {
return [ return [
'go-mod-frankenphp-x86_64-linux', 'go-xcaddy-x86_64-linux',
'go-mod-frankenphp-x86_64-macos', 'go-xcaddy-x86_64-macos',
'go-mod-frankenphp-aarch64-linux', 'go-xcaddy-aarch64-linux',
'go-mod-frankenphp-aarch64-macos', 'go-xcaddy-aarch64-macos',
]; ];
} }

2
src/globals/test-extensions.php
View File

@ -212,7 +212,7 @@ switch ($argv[1] ?? null) {
break; break;
case 'build_embed_cmd': case 'build_embed_cmd':
if ($frankenphp) { if ($frankenphp) {
passthru("{$prefix}install-pkg go-mod-frankenphp --debug", $retcode); passthru("{$prefix}install-pkg go-xcaddy --debug", $retcode);
if ($retcode !== 0) { if ($retcode !== 0) {
break; break;
} }