From 3c0eb68c706ef3a2c520ba509579d36294d8aaf7 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 7 Jul 2024 20:45:18 +0800 Subject: [PATCH] Add pre-built lib feature --- .github/workflows/build-linux-arm.yml | 9 ++- .github/workflows/build-linux-x86_64.yml | 9 ++- .github/workflows/build-macos-aarch64.yml | 9 ++- .github/workflows/build-macos-x86_64.yml | 9 ++- .github/workflows/build-windows-x86_64.yml | 9 ++- .github/workflows/tests.yml | 6 ++ .gitignore | 4 + config/pre-built.json | 5 +- config/source.json | 2 + src/SPC/ConsoleApplication.php | 2 + src/SPC/builder/BuilderBase.php | 13 ++-- src/SPC/builder/LibraryBase.php | 86 +++++++++++++++++++-- src/SPC/builder/linux/library/openssl.php | 6 +- src/SPC/builder/macos/library/openssl.php | 6 +- src/SPC/builder/traits/UnixLibraryTrait.php | 2 +- src/SPC/builder/unix/UnixBuilderBase.php | 9 --- src/SPC/command/BuildCliCommand.php | 2 +- src/SPC/command/BuildLibsCommand.php | 2 +- src/SPC/command/DownloadCommand.php | 62 +++++++++++++-- src/SPC/command/dev/PackLibCommand.php | 85 ++++++++++++++++++++ src/SPC/store/Config.php | 10 +++ src/SPC/store/Downloader.php | 67 +++++++++------- src/SPC/store/FileSystem.php | 2 +- src/SPC/store/source/CustomSourceBase.php | 2 +- src/SPC/store/source/PhpSource.php | 4 +- src/SPC/store/source/PostgreSQLSource.php | 2 +- src/globals/defines.php | 11 ++- 27 files changed, 355 insertions(+), 80 deletions(-) create mode 100644 src/SPC/command/dev/PackLibCommand.php diff --git a/.github/workflows/build-linux-arm.yml b/.github/workflows/build-linux-arm.yml index 20f17fb9..cd5acd53 100644 --- a/.github/workflows/build-linux-arm.yml +++ b/.github/workflows/build-linux-arm.yml @@ -34,7 +34,12 @@ on: description: extensions to compile (comma separated) required: true type: string + prefer-pre-built: + description: prefer pre-built binaries (reduce build time) + type: boolean + default: true debug: + description: enable debug logs type: boolean env: @@ -73,6 +78,8 @@ jobs: # With or without debug - if: inputs.debug == true run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV + - if: inputs.prefer-pre-built == true + run: echo "SPC_PRE_BUILT=--prefer-pre-built" >> $env:GITHUB_ENV # With target select: cli, micro or both - if: ${{ inputs.build-cli == true }} @@ -84,7 +91,7 @@ jobs: # If there's no dependencies cache, fetch sources, with or without debug - if: steps.cache-download.outputs.cache-hit != 'true' - run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} + run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_PRE_BUILT }} # Run build command - run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }} diff --git a/.github/workflows/build-linux-x86_64.yml b/.github/workflows/build-linux-x86_64.yml index 262eb930..a637dd7c 100644 --- a/.github/workflows/build-linux-x86_64.yml +++ b/.github/workflows/build-linux-x86_64.yml @@ -28,7 +28,12 @@ on: description: extensions to compile (comma separated) required: true type: string + prefer-pre-built: + description: prefer pre-built binaries (reduce build time) + type: boolean + default: true debug: + description: enable debug logs type: boolean env: @@ -67,6 +72,8 @@ jobs: # With or without debug - if: inputs.debug == true run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV + - if: inputs.prefer-pre-built == true + run: echo "SPC_PRE_BUILT=--prefer-pre-built" >> $env:GITHUB_ENV # With target select: cli, micro or both - if: ${{ inputs.build-cli == true }} @@ -78,7 +85,7 @@ jobs: # If there's no dependencies cache, fetch sources, with or without debug - if: steps.cache-download.outputs.cache-hit != 'true' - run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} + run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_PRE_BUILT }} # Run build command - run: ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }} diff --git a/.github/workflows/build-macos-aarch64.yml b/.github/workflows/build-macos-aarch64.yml index 591b2ad4..0ffe4bd2 100644 --- a/.github/workflows/build-macos-aarch64.yml +++ b/.github/workflows/build-macos-aarch64.yml @@ -28,7 +28,12 @@ on: description: extensions to compile (comma separated) required: true type: string + prefer-pre-built: + description: prefer pre-built binaries (reduce build time) + type: boolean + default: true debug: + description: enable debug logs type: boolean env: @@ -82,6 +87,8 @@ jobs: # With or without debug - if: inputs.debug == true run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV + - if: inputs.prefer-pre-built == true + run: echo "SPC_PRE_BUILT=--prefer-pre-built" >> $env:GITHUB_ENV # With target select: cli, micro or both - if: ${{ inputs.build-cli == true }} @@ -93,7 +100,7 @@ jobs: # If there's no dependencies cache, fetch sources, with or without debug - if: steps.cache-download.outputs.cache-hit != 'true' - run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} + run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_PRE_BUILT }} # Run build command - run: ./bin/spc build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }} diff --git a/.github/workflows/build-macos-x86_64.yml b/.github/workflows/build-macos-x86_64.yml index 5f753988..d02bd09f 100644 --- a/.github/workflows/build-macos-x86_64.yml +++ b/.github/workflows/build-macos-x86_64.yml @@ -28,7 +28,12 @@ on: description: extensions to compile (comma separated) required: true type: string + prefer-pre-built: + description: prefer pre-built binaries (reduce build time) + type: boolean + default: true debug: + description: enable debug logs type: boolean env: @@ -80,6 +85,8 @@ jobs: # With or without debug - if: inputs.debug == true run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV + - if: inputs.prefer-pre-built == true + run: echo "SPC_PRE_BUILT=--prefer-pre-built" >> $env:GITHUB_ENV # With target select: cli, micro or both - if: ${{ inputs.build-cli == true }} @@ -91,7 +98,7 @@ jobs: # If there's no dependencies cache, fetch sources, with or without debug - if: steps.cache-download.outputs.cache-hit != 'true' - run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} + run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_PRE_BUILT }} # Run build command - run: ./bin/spc build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }} diff --git a/.github/workflows/build-windows-x86_64.yml b/.github/workflows/build-windows-x86_64.yml index e6665d66..17664851 100644 --- a/.github/workflows/build-windows-x86_64.yml +++ b/.github/workflows/build-windows-x86_64.yml @@ -25,7 +25,12 @@ on: description: extensions to compile (comma separated) required: true type: string + prefer-pre-built: + description: prefer pre-built binaries (reduce build time) + type: boolean + default: true debug: + description: enable debug logs type: boolean env: @@ -65,6 +70,8 @@ jobs: # With or without debug - if: inputs.debug == true run: echo "SPC_BUILD_DEBUG=--debug" >> $env:GITHUB_ENV + - if: inputs.prefer-pre-built == true + run: echo "SPC_PRE_BUILT=--prefer-pre-built" >> $env:GITHUB_ENV # With target select: cli, micro or both - if: ${{ inputs.build-cli == true }} @@ -76,7 +83,7 @@ jobs: # If there's no dependencies cache, fetch sources, with or without debug - if: steps.cache-download.outputs.cache-hit != 'true' - run: ./bin/spc download --with-php="${{ inputs.version }}" --for-extensions="${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }} + run: ./bin/spc download --with-php="${{ inputs.version }}" --for-extensions="${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_PRE_BUILT }} # Run build command - run: ./bin/spc build "${{ inputs.extensions }}" ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 14b24260..ed2c0134 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -178,6 +178,12 @@ jobs: run: | bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=5 --shallow-clone + - name: "Download pre-built libraries for pkg-config" + if: matrix.os != 'windows-latest' + run: | + bin/spc del-download pkg-config + bin/spc download pkg-config --prefer-pre-built --debug + - name: "Run Build Tests (build, *nix)" if: matrix.os != 'windows-latest' run: bin/spc build "$(php src/globals/test-extensions.php extensions)" $(php src/globals/test-extensions.php zts) $(php src/globals/test-extensions.php no_strip) $UPX_CMD --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug diff --git a/.gitignore b/.gitignore index 2d19e570..88d8e95f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,10 @@ docker/source/ # default package root directory /pkgroot/ +# default pack:lib and release directory +/dist/ +packlib_files.txt + # tools cache files .php-cs-fixer.cache .phpunit.result.cache diff --git a/config/pre-built.json b/config/pre-built.json index 8b5811e2..396c8820 100644 --- a/config/pre-built.json +++ b/config/pre-built.json @@ -1,5 +1,6 @@ { "repo": "static-php/static-php-cli-hosted", - "match-pattern": "{name}-{arch}-{os}.tgz", - "pack-config": {} + "prefer-stable": true, + "match-pattern": "{name}-{arch}-{os}.txz", + "suffix": "txz" } \ No newline at end of file diff --git a/config/source.json b/config/source.json index 1593fc83..af82b9ef 100644 --- a/config/source.json +++ b/config/source.json @@ -560,6 +560,7 @@ "pkg-config": { "type": "url", "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz", + "provide-pre-built": true, "license": { "type": "file", "path": "COPYING" @@ -761,6 +762,7 @@ "repo": "madler/zlib", "match": "zlib.+\\.tar\\.gz", "prefer-stable": true, + "provide-pre-built": true, "license": { "type": "text", "text": "(C) 1995-2022 Jean-loup Gailly and Mark Adler\n\nThis software is provided 'as-is', without any express or implied\nwarranty. In no event will the authors be held liable for any damages\narising from the use of this software.\n\nPermission is granted to anyone to use this software for any purpose,\nincluding commercial applications, and to alter it and redistribute it\nfreely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you must not\n claim that you wrote the original software. If you use this software\n in a product, an acknowledgment in the product documentation would be\n appreciated but is not required.\n2. Altered source versions must be plainly marked as such, and must not be\n misrepresented as being the original software.\n3. This notice may not be removed or altered from any source distribution.\n\nJean-loup Gailly Mark Adler\njloup@gzip.org madler@alumni.caltech.edu" diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index f0a357fc..8601c8f5 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -11,6 +11,7 @@ use SPC\command\dev\AllExtCommand; use SPC\command\dev\ExtVerCommand; use SPC\command\dev\GenerateExtDocCommand; use SPC\command\dev\LibVerCommand; +use SPC\command\dev\PackLibCommand; use SPC\command\dev\PhpVerCommand; use SPC\command\dev\SortConfigCommand; use SPC\command\DoctorCommand; @@ -54,6 +55,7 @@ final class ConsoleApplication extends Application new ExtVerCommand(), new SortConfigCommand(), new GenerateExtDocCommand(), + new PackLibCommand(), ] ); } diff --git a/src/SPC/builder/BuilderBase.php b/src/SPC/builder/BuilderBase.php index de529165..26d1b874 100644 --- a/src/SPC/builder/BuilderBase.php +++ b/src/SPC/builder/BuilderBase.php @@ -45,20 +45,21 @@ abstract class BuilderBase abstract public function proveLibs(array $sorted_libraries); /** - * Build libraries + * Set-Up libraries * * @throws FileSystemException * @throws RuntimeException * @throws WrongUsageException */ - public function buildLibs(): void + public function setupLibs(): void { // build all libs foreach ($this->libs as $lib) { - match ($lib->tryBuild($this->getOption('rebuild', false))) { - BUILD_STATUS_OK => logger()->info('lib [' . $lib::NAME . '] build success'), - BUILD_STATUS_ALREADY => logger()->notice('lib [' . $lib::NAME . '] already built'), - BUILD_STATUS_FAILED => logger()->error('lib [' . $lib::NAME . '] build failed'), + match ($lib->setup($this->getOption('rebuild', false))) { + LIB_STATUS_OK => logger()->info('lib [' . $lib::NAME . '] setup success'), + LIB_STATUS_ALREADY => logger()->notice('lib [' . $lib::NAME . '] already built'), + LIB_STATUS_BUILD_FAILED => logger()->error('lib [' . $lib::NAME . '] build failed'), + LIB_STATUS_INSTALL_FAILED => logger()->error('lib [' . $lib::NAME . '] install failed'), default => logger()->warning('lib [' . $lib::NAME . '] build status unknown'), }; } diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php index 4ad44c64..cffee91f 100644 --- a/src/SPC/builder/LibraryBase.php +++ b/src/SPC/builder/LibraryBase.php @@ -8,6 +8,7 @@ use SPC\exception\FileSystemException; use SPC\exception\RuntimeException; use SPC\exception\WrongUsageException; use SPC\store\Config; +use SPC\store\FileSystem; use SPC\store\SourceManager; abstract class LibraryBase @@ -32,6 +33,32 @@ abstract class LibraryBase $this->source_dir = $source_dir ?? (SOURCE_PATH . '/' . static::NAME); } + /** + * Try to install or build this library. + * @param bool $force If true, force install or build + * @throws FileSystemException + * @throws RuntimeException + * @throws WrongUsageException + */ + public function setup(bool $force = false): int + { + $lock = json_decode(FileSystem::readFile(DOWNLOAD_PATH . '/.lock.json'), true) ?? []; + $source = Config::getLib(static::NAME, 'source'); + // if source is locked as pre-built, we just tryInstall it + if (isset($lock[$source]) && $lock[$source]['lock_as'] === SPC_LOCK_PRE_BUILT) { + return $this->tryInstall($lock[$source]['filename'], $force); + } + return $this->tryBuild($force); + } + + /** + * Get library name. + */ + public function getName(): string + { + return static::NAME; + } + /** * Get current lib source root dir. */ @@ -119,6 +146,45 @@ abstract class LibraryBase return Config::getLib(static::NAME, 'headers', []); } + /** + * @throws WrongUsageException + * @throws FileSystemException + */ + public function tryInstall(string $install_file, bool $force_install = false): int + { + if ($force_install) { + logger()->info('Installing required library [' . static::NAME . '] from pre-built binaries'); + + // Extract files + try { + FileSystem::extractPackage($install_file, DOWNLOAD_PATH . '/' . $install_file, BUILD_ROOT_PATH); + $this->install(); + return LIB_STATUS_OK; + } catch (FileSystemException|RuntimeException $e) { + logger()->error('Failed to extract pre-built library [' . static::NAME . ']: ' . $e->getMessage()); + return LIB_STATUS_INSTALL_FAILED; + } + } + foreach ($this->getStaticLibs() as $name) { + if (!file_exists(BUILD_LIB_PATH . "/{$name}")) { + $this->tryInstall($install_file, true); + return LIB_STATUS_OK; + } + } + foreach ($this->getHeaders() as $name) { + if (!file_exists(BUILD_INCLUDE_PATH . "/{$name}")) { + $this->tryInstall($install_file, true); + return LIB_STATUS_OK; + } + } + // pkg-config is treated specially. If it is pkg-config, check if the pkg-config binary exists + if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) { + $this->tryInstall($install_file, true); + return LIB_STATUS_OK; + } + return LIB_STATUS_ALREADY; + } + /** * Try to build this library, before build, we check first. * @@ -152,30 +218,30 @@ abstract class LibraryBase $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-build'); $this->build(); $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-build'); - return BUILD_STATUS_OK; + return LIB_STATUS_OK; } // check if these libraries exist, if not, invoke compilation and return the result status foreach ($this->getStaticLibs() as $name) { if (!file_exists(BUILD_LIB_PATH . "/{$name}")) { $this->tryBuild(true); - return BUILD_STATUS_OK; + return LIB_STATUS_OK; } } // header files the same foreach ($this->getHeaders() as $name) { if (!file_exists(BUILD_INCLUDE_PATH . "/{$name}")) { $this->tryBuild(true); - return BUILD_STATUS_OK; + return LIB_STATUS_OK; } } // pkg-config is treated specially. If it is pkg-config, check if the pkg-config binary exists if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) { $this->tryBuild(true); - return BUILD_STATUS_OK; + return LIB_STATUS_OK; } // if all the files exist at this point, skip the compilation process - return BUILD_STATUS_ALREADY; + return LIB_STATUS_ALREADY; } /** @@ -206,6 +272,11 @@ abstract class LibraryBase */ abstract public function getBuilder(): BuilderBase; + public function beforePack(): void + { + // do something before pack, default do nothing. overwrite this method to do something (e.g. modify pkg-config file) + } + /** * Build this library. * @@ -213,6 +284,11 @@ abstract class LibraryBase */ abstract protected function build(); + protected function install(): void + { + // do something after extracting pre-built files, default do nothing. overwrite this method to do something + } + /** * Add lib dependency * diff --git a/src/SPC/builder/linux/library/openssl.php b/src/SPC/builder/linux/library/openssl.php index 9c3b043e..cab38579 100644 --- a/src/SPC/builder/linux/library/openssl.php +++ b/src/SPC/builder/linux/library/openssl.php @@ -79,13 +79,13 @@ class openssl extends LinuxLibraryBase $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']); // patch for openssl 3.3.0+ if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } } } diff --git a/src/SPC/builder/macos/library/openssl.php b/src/SPC/builder/macos/library/openssl.php index b5753b8d..c2087080 100644 --- a/src/SPC/builder/macos/library/openssl.php +++ b/src/SPC/builder/macos/library/openssl.php @@ -62,13 +62,13 @@ class openssl extends MacOSLibraryBase $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']); // patch for openssl 3.3.0+ if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) { - FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file); + FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file); } } } diff --git a/src/SPC/builder/traits/UnixLibraryTrait.php b/src/SPC/builder/traits/UnixLibraryTrait.php index c40db0f4..b1df9194 100644 --- a/src/SPC/builder/traits/UnixLibraryTrait.php +++ b/src/SPC/builder/traits/UnixLibraryTrait.php @@ -75,7 +75,7 @@ trait UnixLibraryTrait logger()->debug('Patching ' . $realpath); // replace prefix $file = FileSystem::readFile($realpath); - $file = ($patch_option & PKGCONF_PATCH_PREFIX) === PKGCONF_PATCH_PREFIX ? preg_replace('/^prefix=.*$/m', 'prefix=' . BUILD_ROOT_PATH, $file) : $file; + $file = ($patch_option & PKGCONF_PATCH_PREFIX) === PKGCONF_PATCH_PREFIX ? preg_replace('/^prefix=.*$/m', 'prefix=${pcfiledir}/../..', $file) : $file; $file = ($patch_option & PKGCONF_PATCH_EXEC_PREFIX) === PKGCONF_PATCH_EXEC_PREFIX ? preg_replace('/^exec_prefix=.*$/m', 'exec_prefix=${prefix}', $file) : $file; $file = ($patch_option & PKGCONF_PATCH_LIBDIR) === PKGCONF_PATCH_LIBDIR ? preg_replace('/^libdir=.*$/m', 'libdir=${prefix}/lib', $file) : $file; $file = ($patch_option & PKGCONF_PATCH_INCLUDEDIR) === PKGCONF_PATCH_INCLUDEDIR ? preg_replace('/^includedir=.*$/m', 'includedir=${prefix}/include', $file) : $file; diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index 18fb6eb0..3ec21f06 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -11,7 +11,6 @@ use SPC\exception\RuntimeException; use SPC\exception\WrongUsageException; use SPC\store\Config; use SPC\store\FileSystem; -use SPC\store\SourceManager; use SPC\util\DependencyUtil; abstract class UnixBuilderBase extends BuilderBase @@ -129,14 +128,6 @@ abstract class UnixBuilderBase extends BuilderBase foreach ($this->libs as $lib) { $lib->calcDependency(); } - - // patch point - $this->emitPatchPoint('before-libs-extract'); - - // extract sources - SourceManager::initSource(libs: $sorted_libraries); - - $this->emitPatchPoint('after-libs-extract'); } /** diff --git a/src/SPC/command/BuildCliCommand.php b/src/SPC/command/BuildCliCommand.php index ca689641..492059ec 100644 --- a/src/SPC/command/BuildCliCommand.php +++ b/src/SPC/command/BuildCliCommand.php @@ -148,7 +148,7 @@ class BuildCliCommand extends BuildCommand // validate libs and exts $builder->validateLibsAndExts(); // build libraries - $builder->buildLibs(); + $builder->setupLibs(); if ($this->input->getOption('with-clean')) { logger()->info('Cleaning source dir...'); diff --git a/src/SPC/command/BuildLibsCommand.php b/src/SPC/command/BuildLibsCommand.php index 8bb08f61..4f20edf3 100644 --- a/src/SPC/command/BuildLibsCommand.php +++ b/src/SPC/command/BuildLibsCommand.php @@ -65,7 +65,7 @@ class BuildLibsCommand extends BuildCommand sleep(2); $builder->proveLibs($libraries); $builder->validateLibsAndExts(); - $builder->buildLibs(); + $builder->setupLibs(); $time = round(microtime(true) - START_TIME, 3); logger()->info('Build libs complete, used ' . $time . ' s !'); diff --git a/src/SPC/command/DownloadCommand.php b/src/SPC/command/DownloadCommand.php index 48fa5e7a..4134d05b 100644 --- a/src/SPC/command/DownloadCommand.php +++ b/src/SPC/command/DownloadCommand.php @@ -38,8 +38,9 @@ class DownloadCommand extends BaseCommand $this->addOption('for-extensions', 'e', InputOption::VALUE_REQUIRED, 'Fetch by extensions, e.g "openssl,mbstring"'); $this->addOption('for-libs', 'l', InputOption::VALUE_REQUIRED, 'Fetch by libraries, e.g "libcares,openssl,onig"'); $this->addOption('without-suggestions', null, null, 'Do not fetch suggested sources when using --for-extensions'); - $this->addOption('ignore-cache-sources', null, InputOption::VALUE_OPTIONAL, 'Ignore some source caches, comma separated, e.g "php-src,curl,openssl"', ''); + $this->addOption('ignore-cache-sources', null, InputOption::VALUE_OPTIONAL, 'Ignore some source caches, comma separated, e.g "php-src,curl,openssl"', false); $this->addOption('retry', 'R', InputOption::VALUE_REQUIRED, 'Set retry time when downloading failed (default: 0)', '0'); + $this->addOption('prefer-pre-built', 'P', null, 'Download pre-built libraries when available'); } /** @@ -147,12 +148,22 @@ class DownloadCommand extends BaseCommand } $chosen_sources = array_map('trim', array_filter(explode(',', $this->getArgument('sources')))); - $force_all = empty($this->getOption('ignore-cache-sources')); - if (!$force_all) { - $force_list = array_map('trim', array_filter(explode(',', $this->getOption('ignore-cache-sources')))); - } else { + + $sss = $this->getOption('ignore-cache-sources'); + if ($sss === false) { + // false is no-any-ignores, that is, default. + $force_all = false; $force_list = []; + } elseif ($sss === null) { + // null means all sources will be ignored, equals to --force-all (but we don't want to add too many options) + $force_all = true; + $force_list = []; + } else { + // ignore some sources + $force_all = false; + $force_list = array_map('trim', array_filter(explode(',', $this->getOption('ignore-cache-sources')))); } + if ($this->getOption('all')) { logger()->notice('Downloading with --all option will take more times to download, we recommend you to download with --for-extensions option !'); } @@ -164,6 +175,17 @@ class DownloadCommand extends BaseCommand $custom_urls[$source_name] = $url; } + // If passing --prefer-pre-built option, we need to load pre-built library list from pre-built.json targeted releases + if ($this->getOption('prefer-pre-built')) { + $repo = Config::getPreBuilt('repo'); + $pre_built_libs = Downloader::getLatestGithubRelease($repo, [ + 'repo' => $repo, + 'prefer-stable' => Config::getPreBuilt('prefer-stable'), + ], false); + } else { + $pre_built_libs = []; + } + // Download them f_mkdir(DOWNLOAD_PATH); $cnt = count($chosen_sources); @@ -185,8 +207,21 @@ class DownloadCommand extends BaseCommand logger()->info("Fetching source {$source} from custom url [{$ni}/{$cnt}]"); Downloader::downloadSource($source, $new_config, true); } else { + $config = Config::getSource($source); + // Prefer pre-built, we need to search pre-built library + if ($this->getOption('prefer-pre-built') && ($config['provide-pre-built'] ?? false) === true) { + // We need to replace pattern + $find = str_replace(['{name}', '{arch}', '{os}'], [$source, arch2gnu(php_uname('m')), strtolower(PHP_OS_FAMILY)], Config::getPreBuilt('match-pattern')); + // find filename in asset list + if (($url = $this->findPreBuilt($pre_built_libs, $find)) !== null) { + logger()->info("Fetching pre-built content {$source} [{$ni}/{$cnt}]"); + Downloader::downloadSource($source, ['type' => 'url', 'url' => $url], $force_all || in_array($source, $force_list), SPC_LOCK_PRE_BUILT); + continue; + } + logger()->warning("Pre-built content not found for {$source}, fallback to source download"); + } logger()->info("Fetching source {$source} [{$ni}/{$cnt}]"); - Downloader::downloadSource($source, Config::getSource($source), $force_all || in_array($source, $force_list)); + Downloader::downloadSource($source, $config, $force_all || in_array($source, $force_list)); } } $time = round(microtime(true) - START_TIME, 3); @@ -286,4 +321,19 @@ class DownloadCommand extends BaseCommand } return array_values(array_unique($sources)); } + + /** + * @param array $assets Asset list from GitHub API + * @param string $filename Match file name, e.g. pkg-config-aarch64-darwin.txz + * @return null|string Return the download URL if found, otherwise null + */ + private function findPreBuilt(array $assets, string $filename): ?string + { + foreach ($assets as $asset) { + if ($asset['name'] === $filename) { + return $asset['browser_download_url']; + } + } + return null; + } } diff --git a/src/SPC/command/dev/PackLibCommand.php b/src/SPC/command/dev/PackLibCommand.php new file mode 100644 index 00000000..8cb9014a --- /dev/null +++ b/src/SPC/command/dev/PackLibCommand.php @@ -0,0 +1,85 @@ +addArgument('library', InputArgument::REQUIRED, 'The library will be compiled'); + } + + public function handle(): int + { + try { + $lib_name = $this->getArgument('library'); + $builder = BuilderProvider::makeBuilderByInput($this->input); + $builder->setLibsOnly(); + $libraries = DependencyUtil::getLibs([$lib_name]); + logger()->info('Building libraries: ' . implode(',', $libraries)); + sleep(2); + + FileSystem::createDir(WORKING_DIR . '/dist'); + + $builder->proveLibs($libraries); + $builder->validateLibsAndExts(); + foreach ($builder->getLibs() as $lib) { + if ($lib->getName() !== $lib_name) { + // other dependencies: install or build, both ok + $lib->setup(); + } else { + // Get lock info + $lock = json_decode(file_get_contents(DOWNLOAD_PATH . '/.lock.json'), true) ?? []; + $source = Config::getLib($lib->getName(), 'source'); + if (!isset($lock[$source]) || ($lock[$source]['lock_as'] ?? SPC_LOCK_SOURCE) === SPC_LOCK_PRE_BUILT) { + logger()->critical("The library {$lib->getName()} is downloaded as pre-built, we need to build it instead of installing pre-built."); + return static::FAILURE; + } + // Before build: load buildroot/ directory + $before_buildroot = FileSystem::scanDirFiles(BUILD_ROOT_PATH, relative: true); + // build + $lib->tryBuild(true); + // do something like patching pkg-conf files. + $lib->beforePack(); + // After build: load buildroot/ directory, and calculate increase files + $after_buildroot = FileSystem::scanDirFiles(BUILD_ROOT_PATH, relative: true); + $increase_files = array_diff($after_buildroot, $before_buildroot); + // every file mapped with BUILD_ROOT_PATH + // get BUILD_ROOT_PATH last dir part + $buildroot_part = basename(BUILD_ROOT_PATH); + $increase_files = array_map(fn ($file) => $buildroot_part . '/' . $file, $increase_files); + // write list to packlib_files.txt + FileSystem::writeFile(WORKING_DIR . '/packlib_files.txt', implode("\n", $increase_files)); + // pack + $filename = WORKING_DIR . '/dist/' . $lib->getName() . '-' . arch2gnu(php_uname('m')) . '-' . strtolower(PHP_OS_FAMILY) . '.' . Config::getPreBuilt('suffix'); + f_passthru('tar -czf ' . $filename . ' -T ' . WORKING_DIR . '/packlib_files.txt -C ' . WORKING_DIR); + logger()->info('Pack library ' . $lib->getName() . ' to ' . $filename . ' complete.'); + } + } + + $time = round(microtime(true) - START_TIME, 3); + logger()->info('Build libs complete, used ' . $time . ' s !'); + return static::SUCCESS; + } catch (\Throwable $e) { + if ($this->getOption('debug')) { + ExceptionHandler::getInstance()->handle($e); + } else { + logger()->critical('Build failed with ' . get_class($e) . ': ' . $e->getMessage()); + logger()->critical('Please check with --debug option to see more details.'); + } + return static::FAILURE; + } + } +} diff --git a/src/SPC/store/Config.php b/src/SPC/store/Config.php index 65340729..42895894 100644 --- a/src/SPC/store/Config.php +++ b/src/SPC/store/Config.php @@ -20,6 +20,16 @@ class Config public static ?array $ext = null; + public static ?array $pre_built = null; + + public static function getPreBuilt(string $name): mixed + { + if (self::$pre_built === null) { + self::$pre_built = FileSystem::loadConfigArray('pre-built'); + } + return self::$pre_built[$name] ?? null; + } + /** * 从配置文件读取一个资源(source)的元信息 * diff --git a/src/SPC/store/Downloader.php b/src/SPC/store/Downloader.php index b1e70c61..6e127c98 100644 --- a/src/SPC/store/Downloader.php +++ b/src/SPC/store/Downloader.php @@ -100,14 +100,15 @@ class Downloader /** * Get latest version from GitHub release (uploaded archive) * - * @param string $name source name - * @param array $source source meta info: [repo, match] - * @return array [url, filename] + * @param string $name source name + * @param array $source source meta info: [repo, match] + * @param bool $match_result Whether to return matched result by `match` param (default: true) + * @return array When $match_result = true, and we matched, [url, filename]. Otherwise, [{asset object}. ...] * @throws DownloaderException */ - public static function getLatestGithubRelease(string $name, array $source): array + public static function getLatestGithubRelease(string $name, array $source, bool $match_result = true): array { - logger()->debug("finding {$name} source from github releases assests"); + logger()->debug("finding {$name} from github releases assests"); $data = json_decode(self::curlExec( url: "https://api.github.com/repos/{$source['repo']}/releases", hooks: [[CurlHook::class, 'setupGithubToken']], @@ -118,6 +119,9 @@ class Downloader if (($source['prefer-stable'] ?? false) === true && $release['prerelease'] === true) { continue; } + if (!$match_result) { + return $release['assets']; + } foreach ($release['assets'] as $asset) { if (preg_match('|' . $source['match'] . '|', $asset['name'])) { $url = $asset['browser_download_url']; @@ -127,7 +131,7 @@ class Downloader } if (!$url) { - throw new DownloaderException("failed to find {$name} source"); + throw new DownloaderException("failed to find {$name} release metadata"); } $filename = basename($url); @@ -176,11 +180,10 @@ class Downloader /** * Just download file using system curl command, and lock it * - * @throws DownloaderException - * @throws RuntimeException * @throws FileSystemException + * @throws RuntimeException */ - public static function downloadFile(string $name, string $url, string $filename, ?string $move_path = null): void + public static function downloadFile(string $name, string $url, string $filename, ?string $move_path = null, int $lock_as = SPC_LOCK_SOURCE): void { logger()->debug("Downloading {$url}"); $cancel_func = function () use ($filename) { @@ -193,7 +196,7 @@ class Downloader self::curlDown(url: $url, path: FileSystem::convertPath(DOWNLOAD_PATH . "/{$filename}"), retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)); self::unregisterCancelEvent(); logger()->debug("Locking {$filename}"); - self::lockSource($name, ['source_type' => 'archive', 'filename' => $filename, 'move_path' => $move_path]); + self::lockSource($name, ['source_type' => 'archive', 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $lock_as]); } /** @@ -218,7 +221,7 @@ class Downloader * @throws FileSystemException * @throws RuntimeException */ - public static function downloadGit(string $name, string $url, string $branch, ?string $move_path = null, int $retry = 0): void + public static function downloadGit(string $name, string $url, string $branch, ?string $move_path = null, int $retry = 0, int $lock_as = SPC_LOCK_SOURCE): void { $download_path = FileSystem::convertPath(DOWNLOAD_PATH . "/{$name}"); if (file_exists($download_path)) { @@ -253,7 +256,7 @@ class Downloader } // Lock logger()->debug("Locking git source {$name}"); - self::lockSource($name, ['source_type' => 'dir', 'dirname' => $name, 'move_path' => $move_path]); + self::lockSource($name, ['source_type' => 'dir', 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]); /* // 复制目录过去 @@ -313,28 +316,28 @@ class Downloader switch ($pkg['type']) { case 'bitbuckettag': // BitBucket Tag [$url, $filename] = self::getLatestBitbucketTag($name, $pkg); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'ghtar': // GitHub Release (tar) [$url, $filename] = self::getLatestGithubTarball($name, $pkg); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'ghtagtar': // GitHub Tag (tar) [$url, $filename] = self::getLatestGithubTarball($name, $pkg, 'tags'); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'ghrel': // GitHub Release (uploaded) [$url, $filename] = self::getLatestGithubRelease($name, $pkg); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'filelist': // Basic File List (regex based crawler) [$url, $filename] = self::getFromFileList($name, $pkg); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'url': // Direct download URL $url = $pkg['url']; $filename = $pkg['filename'] ?? basename($pkg['url']); - self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null); + self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null, SPC_LOCK_PRE_BUILT); break; case 'git': // Git repo self::downloadGit( @@ -342,7 +345,8 @@ class Downloader $pkg['url'], $pkg['rev'], $pkg['extract'] ?? null, - intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0) + intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0), + SPC_LOCK_PRE_BUILT ); break; case 'custom': // Custom download method, like API-based download or other @@ -371,12 +375,14 @@ class Downloader /** * Download source by name and meta. * - * @param string $name source name - * @param null|array $source source meta info: [type, path, rev, url, filename, regex, license] + * @param string $name source name + * @param null|array $source source meta info: [type, path, rev, url, filename, regex, license] + * @param bool $force Whether to force download (default: false) + * @param int $lock_as Lock source type (default: SPC_LOCK_SOURCE) * @throws DownloaderException * @throws FileSystemException */ - public static function downloadSource(string $name, ?array $source = null, bool $force = false): void + public static function downloadSource(string $name, ?array $source = null, bool $force = false, int $lock_as = SPC_LOCK_SOURCE): void { if ($source === null) { $source = Config::getSource($name); @@ -413,28 +419,28 @@ class Downloader switch ($source['type']) { case 'bitbuckettag': // BitBucket Tag [$url, $filename] = self::getLatestBitbucketTag($name, $source); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'ghtar': // GitHub Release (tar) [$url, $filename] = self::getLatestGithubTarball($name, $source); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'ghtagtar': // GitHub Tag (tar) [$url, $filename] = self::getLatestGithubTarball($name, $source, 'tags'); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'ghrel': // GitHub Release (uploaded) [$url, $filename] = self::getLatestGithubRelease($name, $source); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'filelist': // Basic File List (regex based crawler) [$url, $filename] = self::getFromFileList($name, $source); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'url': // Direct download URL $url = $source['url']; $filename = $source['filename'] ?? basename($source['url']); - self::downloadFile($name, $url, $filename, $source['path'] ?? null); + self::downloadFile($name, $url, $filename, $source['path'] ?? null, $lock_as); break; case 'git': // Git repo self::downloadGit( @@ -442,14 +448,15 @@ class Downloader $source['url'], $source['rev'], $source['path'] ?? null, - intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0) + intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0), + $lock_as ); break; case 'custom': // Custom download method, like API-based download or other $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\store\source'); foreach ($classes as $class) { if (is_a($class, CustomSourceBase::class, true) && $class::NAME === $name) { - (new $class())->fetch($force); + (new $class())->fetch($force, $source, $lock_as); break; } } diff --git a/src/SPC/store/FileSystem.php b/src/SPC/store/FileSystem.php index 0d1aee72..cbf6107e 100644 --- a/src/SPC/store/FileSystem.php +++ b/src/SPC/store/FileSystem.php @@ -16,7 +16,7 @@ class FileSystem */ public static function loadConfigArray(string $config, ?string $config_dir = null): array { - $whitelist = ['ext', 'lib', 'source', 'pkg']; + $whitelist = ['ext', 'lib', 'source', 'pkg', 'pre-built']; if (!in_array($config, $whitelist)) { throw new FileSystemException('Reading ' . $config . '.json is not allowed'); } diff --git a/src/SPC/store/source/CustomSourceBase.php b/src/SPC/store/source/CustomSourceBase.php index da7c4ce1..2df8eb7e 100644 --- a/src/SPC/store/source/CustomSourceBase.php +++ b/src/SPC/store/source/CustomSourceBase.php @@ -8,5 +8,5 @@ abstract class CustomSourceBase { public const NAME = 'unknown'; - abstract public function fetch(bool $force = false); + abstract public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_LOCK_SOURCE): void; } diff --git a/src/SPC/store/source/PhpSource.php b/src/SPC/store/source/PhpSource.php index f4cc7d44..79835636 100644 --- a/src/SPC/store/source/PhpSource.php +++ b/src/SPC/store/source/PhpSource.php @@ -17,7 +17,7 @@ class PhpSource extends CustomSourceBase * @throws DownloaderException * @throws FileSystemException */ - public function fetch(bool $force = false): void + public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_LOCK_SOURCE): void { $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.1'; Downloader::downloadSource('php-src', self::getLatestPHPInfo($major), $force); @@ -45,7 +45,7 @@ class PhpSource extends CustomSourceBase // 从官网直接下载 return [ 'type' => 'url', - 'url' => "https://www.php.net/distributions/php-{$version}.tar.gz", + 'url' => "https://www.php.net/distributions/php-{$version}.tar.xz", ]; } } diff --git a/src/SPC/store/source/PostgreSQLSource.php b/src/SPC/store/source/PostgreSQLSource.php index 1f5d9bc0..113abc98 100644 --- a/src/SPC/store/source/PostgreSQLSource.php +++ b/src/SPC/store/source/PostgreSQLSource.php @@ -16,7 +16,7 @@ class PostgreSQLSource extends CustomSourceBase * @throws DownloaderException * @throws FileSystemException */ - public function fetch(bool $force = false): void + public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_LOCK_SOURCE): void { Downloader::downloadSource('postgresql', self::getLatestInfo(), $force); } diff --git a/src/globals/defines.php b/src/globals/defines.php index bcd59a16..aa622eb1 100644 --- a/src/globals/defines.php +++ b/src/globals/defines.php @@ -56,15 +56,20 @@ const SPC_EXTENSION_ALIAS = [ 'zendopcache' => 'opcache', ]; +// spc lock type +const SPC_LOCK_SOURCE = 1; // lock source +const SPC_LOCK_PRE_BUILT = 2; // lock pre-built + // file replace strategy const REPLACE_FILE_STR = 1; const REPLACE_FILE_PREG = 2; const REPLACE_FILE_USER = 3; // library build status -const BUILD_STATUS_OK = 0; -const BUILD_STATUS_ALREADY = 1; -const BUILD_STATUS_FAILED = 2; +const LIB_STATUS_OK = 0; +const LIB_STATUS_ALREADY = 1; +const LIB_STATUS_BUILD_FAILED = 2; +const LIB_STATUS_INSTALL_FAILED = 3; // build target type const BUILD_TARGET_NONE = 0; // no target