crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-04 15:25:41 +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

21
src/SPC/util/executor/UnixCMakeExecutor.php
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);
}
/**