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

Fix missing constant for PHP_SDK_PATH

Browse Source
This commit is contained in:
crazywhalecc 2024-10-03 10:44:49 +08:00 committed by Jerry Ma
parent 1ce3c1bc47
commit c841ef5b9a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPC/builder/windows/SystemUtil.php
View File

@ -21,7 +21,7 @@ class SystemUtil
if (!$paths) { if (!$paths) {
$paths = explode(PATH_SEPARATOR, getenv('Path')); $paths = explode(PATH_SEPARATOR, getenv('Path'));
if ($include_sdk_bin) { if ($include_sdk_bin) {
$paths[] = PHP_SDK_PATH . '\bin'; $paths[] = getenv('PHP_SDK_PATH') . '\bin';
} }
} }
foreach ($paths as $path) { foreach ($paths as $path) {

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

@ -38,7 +38,7 @@ class WindowsBuilder extends BuilderBase
// ---------- set necessary options ---------- // ---------- set necessary options ----------
// set sdk (require visual studio 16 or 17) // set sdk (require visual studio 16 or 17)
$vs = SystemUtil::findVisualStudio()['version']; $vs = SystemUtil::findVisualStudio()['version'];
$this->sdk_prefix = PHP_SDK_PATH . "\\phpsdk-{$vs}-x64.bat -t"; $this->sdk_prefix = getenv('PHP_SDK_PATH') . "\\phpsdk-{$vs}-x64.bat -t";
// set zts // set zts
$this->zts = $this->getOption('enable-zts', false); $this->zts = $this->getOption('enable-zts', false);

8
src/SPC/doctor/item/WindowsToolCheckList.php
View File

@ -37,10 +37,10 @@ class WindowsToolCheckList
#[AsCheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 997)] #[AsCheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 997)]
public function checkSDK(): ?CheckResult public function checkSDK(): ?CheckResult
{ {
if (!file_exists(PHP_SDK_PATH . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) { if (!file_exists(getenv('PHP_SDK_PATH') . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) {
return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk'); return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk');
} }
return CheckResult::ok(PHP_SDK_PATH); return CheckResult::ok(getenv('PHP_SDK_PATH'));
} }
#[AsCheckItem('if git associated command exists', limit_os: 'Windows', level: 996)] #[AsCheckItem('if git associated command exists', limit_os: 'Windows', level: 996)]
@ -81,8 +81,8 @@ class WindowsToolCheckList
public function installPhpSdk(): bool public function installPhpSdk(): bool
{ {
try { try {
FileSystem::removeDir(PHP_SDK_PATH); FileSystem::removeDir(getenv('PHP_SDK_PATH'));
cmd(true)->exec('git.exe clone --depth 1 https://github.com/php/php-sdk-binary-tools.git ' . PHP_SDK_PATH); cmd(true)->exec('git.exe clone --depth 1 https://github.com/php/php-sdk-binary-tools.git ' . getenv('PHP_SDK_PATH'));
} catch (RuntimeException) { } catch (RuntimeException) {
return false; return false;
} }

4
src/SPC/store/FileSystem.php
View File

@ -428,7 +428,7 @@ class FileSystem
{ {
$replacement = [ $replacement = [
'{pkg_root_path}' => PKG_ROOT_PATH, '{pkg_root_path}' => PKG_ROOT_PATH,
'{php_sdk_path}' => defined('PHP_SDK_PATH') ? PHP_SDK_PATH : WORKING_DIR . '/php-sdk-binary-tools', '{php_sdk_path}' => getenv('PHP_SDK_PATH') ? getenv('PHP_SDK_PATH') : WORKING_DIR . '/php-sdk-binary-tools',
'{working_dir}' => WORKING_DIR, '{working_dir}' => WORKING_DIR,
'{download_path}' => DOWNLOAD_PATH, '{download_path}' => DOWNLOAD_PATH,
'{source_path}' => SOURCE_PATH, '{source_path}' => SOURCE_PATH,
@ -480,7 +480,7 @@ class FileSystem
}; };
} elseif (PHP_OS_FAMILY === 'Windows') { } elseif (PHP_OS_FAMILY === 'Windows') {
// use php-sdk-binary-tools/bin/7za.exe // use php-sdk-binary-tools/bin/7za.exe
$_7z = self::convertPath(PHP_SDK_PATH . '/bin/7za.exe'); $_7z = self::convertPath(getenv('PHP_SDK_PATH') . '/bin/7za.exe');
// Windows notes: I hate windows tar....... // Windows notes: I hate windows tar.......
// When extracting .tar.gz like libxml2, it shows a symlink error and returns code[1]. // When extracting .tar.gz like libxml2, it shows a symlink error and returns code[1].

2
src/SPC/util/GlobalEnvManager.php
View File

@ -46,7 +46,7 @@ class GlobalEnvManager
// Define env vars for linux // Define env vars for linux
if (PHP_OS_FAMILY === 'Linux') { if (PHP_OS_FAMILY === 'Linux') {
$arch = GNU_ARCH; $arch = arch2gnu(php_uname('m'));
if (SystemUtil::isMuslDist()) { if (SystemUtil::isMuslDist()) {
self::putenv('SPC_LINUX_DEFAULT_CC=gcc'); self::putenv('SPC_LINUX_DEFAULT_CC=gcc');
self::putenv('SPC_LINUX_DEFAULT_CXX=g++'); self::putenv('SPC_LINUX_DEFAULT_CXX=g++');