crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-06 00:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ext/gettext

Browse Source 
# Conflicts:
#	config/ext.json
#	src/globals/test-extensions.php
This commit is contained in:
crazywhalecc
2024-02-16 19:42:18 +08:00
parent 227bf73870 be2394b39b
commit e5d2d5e689
13 changed files with 300 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,6 +231,30 @@ abstract class BuilderBase
throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
}
/**
* Get PHP version from archive file name.
*
* @param null|string $file php-*.*.*.tar.gz filename, read from lockfile if empty
*/
public function getPHPVersionFromArchive(?string $file = null): false|string
{
if ($file === null) {
$lock = file_exists(DOWNLOAD_PATH . '/.lock.json') ? file_get_contents(DOWNLOAD_PATH . '/.lock.json') : false;
if ($lock === false) {
return false;
}
$lock = json_decode($lock, true);
$file = $lock['php-src']['filename'] ?? null;
if ($file === null) {
return false;
}
}
if (preg_match('/php-(\d+\.\d+\.\d+)/', $file, $match)) {
return $match[1];
}
return false;
}
/**
* Get build type name string to display.
*

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

@@ -107,7 +107,7 @@ abstract class UnixBuilderBase extends BuilderBase
// if no libs specified, compile all supported libs
if ($sorted_libraries === [] && $this->isLibsOnly()) {
$libraries = array_keys($support_lib_list);
$sorted_libraries = DependencyUtil::getLibsByDeps($libraries);
$sorted_libraries = DependencyUtil::getLibs($libraries);
}
// pkg-config must be compiled first, whether it is specified or not

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

@@ -192,7 +192,7 @@ class WindowsBuilder extends BuilderBase
// if no libs specified, compile all supported libs
if ($sorted_libraries === [] && $this->isLibsOnly()) {
$libraries = array_keys($support_lib_list);
$sorted_libraries = DependencyUtil::getLibsByDeps($libraries);
$sorted_libraries = DependencyUtil::getLibs($libraries);
}
// add lib object for builder