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

Rename setCMakeBuildDir to setBuildDir

Browse Source
This commit is contained in:
crazywhalecc
2025-06-09 09:26:39 +08:00
parent f46b714990
commit 9babe7f1d2
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPC/builder/macos/library/glfw.php
View File

@@ -19,7 +19,7 @@ class glfw extends MacOSLibraryBase
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->source_dir}/vendor/glfw") ->setBuildDir("{$this->source_dir}/vendor/glfw")
->setReset(false) ->setReset(false)
->addConfigureArgs( ->addConfigureArgs(
'-DGLFW_BUILD_EXAMPLES=OFF', '-DGLFW_BUILD_EXAMPLES=OFF',

2
src/SPC/builder/unix/library/brotli.php
View File

@@ -18,7 +18,7 @@ trait brotli
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->getSourceDir()}/build-dir") ->setBuildDir("{$this->getSourceDir()}/build-dir")
->build(); ->build();
$this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']); $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']);

2
src/SPC/builder/unix/library/libaom.php
View File

@@ -17,7 +17,7 @@ trait libaom
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->source_dir}/builddir") ->setBuildDir("{$this->source_dir}/builddir")
->addConfigureArgs('-DAOM_TARGET_GPU=generic') ->addConfigureArgs('-DAOM_TARGET_GPU=generic')
->build(); ->build();
$this->patchPkgconfPrefix(['aom.pc']); $this->patchPkgconfPrefix(['aom.pc']);

2
src/SPC/builder/unix/library/snappy.php
View File

@@ -17,7 +17,7 @@ trait snappy
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->source_dir}/cmake/build") ->setBuildDir("{$this->source_dir}/cmake/build")
->addConfigureArgs( ->addConfigureArgs(
'-DSNAPPY_BUILD_TESTS=OFF', '-DSNAPPY_BUILD_TESTS=OFF',
'-DSNAPPY_BUILD_BENCHMARKS=OFF', '-DSNAPPY_BUILD_BENCHMARKS=OFF',

2
src/SPC/builder/unix/library/tidy.php
View File

@@ -17,7 +17,7 @@ trait tidy
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->source_dir}/build-dir") ->setBuildDir("{$this->source_dir}/build-dir")
->addConfigureArgs('-DSUPPORT_CONSOLE_APP=OFF') ->addConfigureArgs('-DSUPPORT_CONSOLE_APP=OFF')
->build(); ->build();
$this->patchPkgconfPrefix(['tidy.pc']); $this->patchPkgconfPrefix(['tidy.pc']);

2
src/SPC/builder/unix/library/zstd.php
View File

@@ -17,7 +17,7 @@ trait zstd
protected function build(): void protected function build(): void
{ {
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->setCMakeBuildDir("{$this->source_dir}/build/cmake/build") ->setBuildDir("{$this->source_dir}/build/cmake/build")
->addConfigureArgs( ->addConfigureArgs(
'-DZSTD_BUILD_STATIC=ON', '-DZSTD_BUILD_STATIC=ON',
'-DZSTD_BUILD_SHARED=OFF', '-DZSTD_BUILD_SHARED=OFF',

21
src/SPC/util/executor/UnixCMakeExecutor.php
View File

@@ -14,7 +14,7 @@ use SPC\store\FileSystem;
*/ */
class UnixCMakeExecutor extends Executor class UnixCMakeExecutor extends Executor
{ {
protected ?string $cmake_build_dir = null; protected ?string $build_dir = null;
protected array $configure_args = []; protected array $configure_args = [];
@@ -27,10 +27,10 @@ class UnixCMakeExecutor extends Executor
public function build(string $build_pos = '..'): void public function build(string $build_pos = '..'): void
{ {
// set cmake dir // set cmake dir
$this->initCMakeBuildDir(); $this->initBuildDir();
if ($this->reset) { if ($this->reset) {
FileSystem::resetDir($this->cmake_build_dir); FileSystem::resetDir($this->build_dir);
} }
// prepare environment variables // prepare environment variables
@@ -41,7 +41,7 @@ class UnixCMakeExecutor extends Executor
]; ];
// prepare shell // prepare shell
$shell = shell()->cd($this->cmake_build_dir)->setEnv($env); $shell = shell()->cd($this->build_dir)->setEnv($env);
// config // config
$this->steps >= 1 && $shell->execWithEnv("cmake {$this->getConfigureArgs()} {$this->getDefaultCMakeArgs()} {$build_pos}"); $this->steps >= 1 && $shell->execWithEnv("cmake {$this->getConfigureArgs()} {$this->getDefaultCMakeArgs()} {$build_pos}");
@@ -99,9 +99,9 @@ class UnixCMakeExecutor extends Executor
* *
* @param string $dir custom CMake build directory * @param string $dir custom CMake build directory
*/ */
public function setCMakeBuildDir(string $dir): static public function setBuildDir(string $dir): static
{ {
$this->cmake_build_dir = $dir; $this->build_dir = $dir;
return $this; return $this;
} }
@@ -152,15 +152,12 @@ class UnixCMakeExecutor extends Executor
/** /**
* Initialize the CMake build directory. * Initialize the CMake build directory.
* If the directory is not set, it defaults to the library's source directory with '/build' appended. * If the directory is not set, it defaults to the library's source directory with '/build' appended.
*
* @throws FileSystemException
*/ */
private function initCMakeBuildDir(): void private function initBuildDir(): void
{ {
if ($this->cmake_build_dir === null) { if ($this->build_dir === null) {
$this->cmake_build_dir = "{$this->library->getSourceDir()}/build"; $this->build_dir = "{$this->library->getSourceDir()}/build";
} }
FileSystem::resetDir($this->cmake_build_dir);
} }
/** /**