Rename setCMakeBuildDir to setBuildDir

This commit is contained in:
crazywhalecc 2025-06-09 09:26:39 +08:00
parent f46b714990
commit 9babe7f1d2
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
7 changed files with 15 additions and 18 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -14,7 +14,7 @@ use SPC\store\FileSystem;
*/
class UnixCMakeExecutor extends Executor
{
protected ?string $cmake_build_dir = null;
protected ?string $build_dir = null;
protected array $configure_args = [];
@ -27,10 +27,10 @@ class UnixCMakeExecutor extends Executor
public function build(string $build_pos = '..'): void
{
// set cmake dir
$this->initCMakeBuildDir();
$this->initBuildDir();
if ($this->reset) {
FileSystem::resetDir($this->cmake_build_dir);
FileSystem::resetDir($this->build_dir);
}
// prepare environment variables
@ -41,7 +41,7 @@ class UnixCMakeExecutor extends Executor
];
// prepare shell
$shell = shell()->cd($this->cmake_build_dir)->setEnv($env);
$shell = shell()->cd($this->build_dir)->setEnv($env);
// config
$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
*/
public function setCMakeBuildDir(string $dir): static
public function setBuildDir(string $dir): static
{
$this->cmake_build_dir = $dir;
$this->build_dir = $dir;
return $this;
}
@ -152,15 +152,12 @@ class UnixCMakeExecutor extends Executor
/**
* Initialize the CMake build directory.
* 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) {
$this->cmake_build_dir = "{$this->library->getSourceDir()}/build";
if ($this->build_dir === null) {
$this->build_dir = "{$this->library->getSourceDir()}/build";
}
FileSystem::resetDir($this->cmake_build_dir);
}
/**