mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-08 01:15:37 +08:00
Fix zlib produced lib file names from different zlib version (#1066)
This commit is contained in:
@@ -31,8 +31,23 @@ class zlib extends WindowsLibraryBase
|
|||||||
$this->builder->makeSimpleWrapper('cmake'),
|
$this->builder->makeSimpleWrapper('cmake'),
|
||||||
"--build build --config Release --target install -j{$this->builder->concurrency}"
|
"--build build --config Release --target install -j{$this->builder->concurrency}"
|
||||||
);
|
);
|
||||||
copy(BUILD_LIB_PATH . '\zlibstatic.lib', BUILD_LIB_PATH . '\zlib_a.lib');
|
$detect_list = [
|
||||||
unlink(BUILD_ROOT_PATH . '\bin\zlib.dll');
|
'zlibstatic.lib',
|
||||||
unlink(BUILD_LIB_PATH . '\zlib.lib');
|
'zs.lib',
|
||||||
|
'libzs.lib',
|
||||||
|
];
|
||||||
|
foreach ($detect_list as $item) {
|
||||||
|
if (file_exists(BUILD_LIB_PATH . '\\' . $item)) {
|
||||||
|
FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlib_a.lib');
|
||||||
|
FileSystem::copy(BUILD_LIB_PATH . '\\' . $item, BUILD_LIB_PATH . '\zlibstatic.lib');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '\bin\zlib.dll');
|
||||||
|
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\zlib.lib');
|
||||||
|
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.dll');
|
||||||
|
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\libz.lib');
|
||||||
|
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.lib');
|
||||||
|
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '\z.dll');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
// test php version (8.1 ~ 8.4 available, multiple for matrix)
|
// test php version (8.1 ~ 8.4 available, multiple for matrix)
|
||||||
$test_php_version = [
|
$test_php_version = [
|
||||||
// '8.1',
|
'8.1',
|
||||||
// '8.2',
|
// '8.2',
|
||||||
// '8.3',
|
// '8.3',
|
||||||
'8.4',
|
'8.4',
|
||||||
@@ -23,15 +23,15 @@ $test_php_version = [
|
|||||||
|
|
||||||
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
|
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
|
||||||
$test_os = [
|
$test_os = [
|
||||||
'macos-15-intel', // bin/spc for x86_64
|
// 'macos-15-intel', // bin/spc for x86_64
|
||||||
'macos-15', // bin/spc for arm64
|
// 'macos-15', // bin/spc for arm64
|
||||||
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
|
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
|
||||||
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
|
// 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
|
||||||
'ubuntu-24.04', // bin/spc for x86_64
|
// 'ubuntu-24.04', // bin/spc for x86_64
|
||||||
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
|
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
|
||||||
'ubuntu-24.04-arm', // bin/spc for arm64
|
// 'ubuntu-24.04-arm', // bin/spc for arm64
|
||||||
// 'windows-2022', // .\bin\spc.ps1
|
// 'windows-2022', // .\bin\spc.ps1
|
||||||
// 'windows-2025',
|
'windows-2025', // .\bin\spc.ps1
|
||||||
];
|
];
|
||||||
|
|
||||||
// whether enable thread safe
|
// whether enable thread safe
|
||||||
@@ -51,7 +51,7 @@ $prefer_pre_built = false;
|
|||||||
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
|
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
|
||||||
$extensions = match (PHP_OS_FAMILY) {
|
$extensions = match (PHP_OS_FAMILY) {
|
||||||
'Linux', 'Darwin' => 'pdo_odbc',
|
'Linux', 'Darwin' => 'pdo_odbc',
|
||||||
'Windows' => 'com_dotnet',
|
'Windows' => 'zlib,phar,mbstring,mbregex,sockets',
|
||||||
};
|
};
|
||||||
|
|
||||||
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
|
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
|
||||||
|
|||||||
Reference in New Issue
Block a user