From 0558d67240e0304b8ec5ee181e0a22ab1f86a80d Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 9 Jun 2025 11:12:34 +0800 Subject: [PATCH] Rename initBuildEnv to initializeEnv --- src/SPC/builder/linux/library/libffi.php | 2 +- src/SPC/builder/linux/library/libpng.php | 2 +- src/SPC/builder/linux/library/openssl.php | 2 +- src/SPC/builder/macos/library/openssl.php | 2 +- src/SPC/builder/unix/library/attr.php | 2 +- src/SPC/builder/unix/library/bzip2.php | 2 +- src/SPC/builder/unix/library/gettext.php | 2 +- src/SPC/builder/unix/library/gmp.php | 2 +- src/SPC/builder/unix/library/imagemagick.php | 2 +- src/SPC/builder/unix/library/ldap.php | 2 +- src/SPC/builder/unix/library/libacl.php | 2 +- src/SPC/builder/unix/library/libargon2.php | 2 +- src/SPC/builder/unix/library/libcares.php | 2 +- src/SPC/builder/unix/library/libiconv.php | 2 +- src/SPC/builder/unix/library/liblz4.php | 2 +- src/SPC/builder/unix/library/libtiff.php | 2 +- src/SPC/builder/unix/library/libxslt.php | 2 +- src/SPC/builder/unix/library/ncurses.php | 2 +- src/SPC/builder/unix/library/nghttp2.php | 2 +- src/SPC/builder/unix/library/nghttp3.php | 2 +- src/SPC/builder/unix/library/ngtcp2.php | 2 +- src/SPC/builder/unix/library/onig.php | 2 +- src/SPC/builder/unix/library/pkgconfig.php | 2 +- src/SPC/builder/unix/library/readline.php | 2 +- src/SPC/builder/unix/library/sqlite.php | 2 +- src/SPC/builder/unix/library/zlib.php | 2 +- src/SPC/util/UnixShell.php | 2 +- src/SPC/util/executor/UnixCMakeExecutor.php | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/SPC/builder/linux/library/libffi.php b/src/SPC/builder/linux/library/libffi.php index 0324f92c..e64581bc 100644 --- a/src/SPC/builder/linux/library/libffi.php +++ b/src/SPC/builder/linux/library/libffi.php @@ -21,7 +21,7 @@ class libffi extends LinuxLibraryBase $arch = getenv('SPC_ARCH'); shell()->cd($this->source_dir) - ->initLibBuildEnv($this) + ->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/linux/library/libpng.php b/src/SPC/builder/linux/library/libpng.php index fc8c8099..8c33ef0f 100644 --- a/src/SPC/builder/linux/library/libpng.php +++ b/src/SPC/builder/linux/library/libpng.php @@ -41,7 +41,7 @@ class libpng extends LinuxLibraryBase 'aarch64' => '--enable-arm-neon ', default => '', }; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec('chmod +x ./configure') ->exec('chmod +x ./install-sh') ->exec( diff --git a/src/SPC/builder/linux/library/openssl.php b/src/SPC/builder/linux/library/openssl.php index 576396e6..11c60067 100644 --- a/src/SPC/builder/linux/library/openssl.php +++ b/src/SPC/builder/linux/library/openssl.php @@ -64,7 +64,7 @@ class openssl extends LinuxLibraryBase $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : ''; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( "{$env} ./Configure no-shared {$extra} " . '--prefix=/ ' . diff --git a/src/SPC/builder/macos/library/openssl.php b/src/SPC/builder/macos/library/openssl.php index f4512871..d641fc1d 100644 --- a/src/SPC/builder/macos/library/openssl.php +++ b/src/SPC/builder/macos/library/openssl.php @@ -49,7 +49,7 @@ class openssl extends MacOSLibraryBase } $arch = getenv('SPC_ARCH'); - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( "./Configure no-shared {$extra} " . '--prefix=/ ' . // use prefix=/ diff --git a/src/SPC/builder/unix/library/attr.php b/src/SPC/builder/unix/library/attr.php index 26278cb0..b6254720 100644 --- a/src/SPC/builder/unix/library/attr.php +++ b/src/SPC/builder/unix/library/attr.php @@ -13,7 +13,7 @@ trait attr */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['CFLAGS' => "-I{$this->getIncludeDir()}", 'LDFLAGS' => "-L{$this->getLibDir()}"]) ->exec('libtoolize --force --copy') ->exec('./autogen.sh || autoreconf -if') diff --git a/src/SPC/builder/unix/library/bzip2.php b/src/SPC/builder/unix/library/bzip2.php index 7315f4e1..32d87270 100644 --- a/src/SPC/builder/unix/library/bzip2.php +++ b/src/SPC/builder/unix/library/bzip2.php @@ -16,7 +16,7 @@ trait bzip2 protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec("make PREFIX='" . BUILD_ROOT_PATH . "' clean") ->exec("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a") ->exec('cp libbz2.a ' . BUILD_LIB_PATH) diff --git a/src/SPC/builder/unix/library/gettext.php b/src/SPC/builder/unix/library/gettext.php index b3800ac5..75f50d1b 100644 --- a/src/SPC/builder/unix/library/gettext.php +++ b/src/SPC/builder/unix/library/gettext.php @@ -16,7 +16,7 @@ trait gettext $cflags = $this->builder->getOption('enable-zts') ? '-lpthread -D_REENTRANT' : ''; $ldflags = $this->builder->getOption('enable-zts') ? '-lpthread' : ''; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['CFLAGS' => $cflags, 'LDFLAGS' => $ldflags]) ->exec( './configure ' . diff --git a/src/SPC/builder/unix/library/gmp.php b/src/SPC/builder/unix/library/gmp.php index 40cf71d5..2f4ba1a4 100644 --- a/src/SPC/builder/unix/library/gmp.php +++ b/src/SPC/builder/unix/library/gmp.php @@ -15,7 +15,7 @@ trait gmp */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static --disable-shared ' . diff --git a/src/SPC/builder/unix/library/imagemagick.php b/src/SPC/builder/unix/library/imagemagick.php index 6f39385c..5ace2296 100644 --- a/src/SPC/builder/unix/library/imagemagick.php +++ b/src/SPC/builder/unix/library/imagemagick.php @@ -46,7 +46,7 @@ trait imagemagick // libxml iconv patch $required_libs .= $this instanceof MacOSLibraryBase ? ('-liconv') : ''; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['LDFLAGS' => $ldflags, 'LIBS' => $required_libs, 'PKG_CONFIG' => '$PKG_CONFIG --static']) ->exec( './configure ' . diff --git a/src/SPC/builder/unix/library/ldap.php b/src/SPC/builder/unix/library/ldap.php index 0d1b1ad2..bad3a65b 100644 --- a/src/SPC/builder/unix/library/ldap.php +++ b/src/SPC/builder/unix/library/ldap.php @@ -26,7 +26,7 @@ trait ldap $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '--enable-argon2=no '; f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config'); f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig'); - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['LDFLAGS' => "-L{$this->getLibDir()}"]) ->exec( $this->builder->makeAutoconfFlags(AUTOCONF_CPPFLAGS) . diff --git a/src/SPC/builder/unix/library/libacl.php b/src/SPC/builder/unix/library/libacl.php index 0522786f..8f61be1b 100644 --- a/src/SPC/builder/unix/library/libacl.php +++ b/src/SPC/builder/unix/library/libacl.php @@ -29,7 +29,7 @@ trait libacl */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['CFLAGS' => "-I{$this->getIncludeDir()}", 'LDFLAGS' => "-L{$this->getLibDir()}"]) ->exec('libtoolize --force --copy') ->exec('./autogen.sh || autoreconf -if') diff --git a/src/SPC/builder/unix/library/libargon2.php b/src/SPC/builder/unix/library/libargon2.php index e235f575..4c760095 100644 --- a/src/SPC/builder/unix/library/libargon2.php +++ b/src/SPC/builder/unix/library/libargon2.php @@ -10,7 +10,7 @@ trait libargon2 { protected function build() { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec("make PREFIX='' clean") ->exec("make -j{$this->builder->concurrency} PREFIX=''") ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); diff --git a/src/SPC/builder/unix/library/libcares.php b/src/SPC/builder/unix/library/libcares.php index 3acd9814..61683bbf 100644 --- a/src/SPC/builder/unix/library/libcares.php +++ b/src/SPC/builder/unix/library/libcares.php @@ -24,7 +24,7 @@ trait libcares */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec('./configure --prefix= --enable-static --disable-shared --disable-tests --with-pic') ->exec("make -j {$this->builder->concurrency}") ->exec('make install DESTDIR=' . BUILD_ROOT_PATH); diff --git a/src/SPC/builder/unix/library/libiconv.php b/src/SPC/builder/unix/library/libiconv.php index 6037d5d0..89c8e5bf 100644 --- a/src/SPC/builder/unix/library/libiconv.php +++ b/src/SPC/builder/unix/library/libiconv.php @@ -10,7 +10,7 @@ trait libiconv { [,,$destdir] = SEPARATED_PATH; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/unix/library/liblz4.php b/src/SPC/builder/unix/library/liblz4.php index d5283cbe..73108d95 100644 --- a/src/SPC/builder/unix/library/liblz4.php +++ b/src/SPC/builder/unix/library/liblz4.php @@ -17,7 +17,7 @@ trait liblz4 protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec("make PREFIX='' clean") ->exec("make -j{$this->builder->concurrency} PREFIX=''") ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); diff --git a/src/SPC/builder/unix/library/libtiff.php b/src/SPC/builder/unix/library/libtiff.php index 5561adcb..17862a79 100644 --- a/src/SPC/builder/unix/library/libtiff.php +++ b/src/SPC/builder/unix/library/libtiff.php @@ -22,7 +22,7 @@ trait libtiff // We disabled lzma, zstd, webp, libdeflate by default to reduce the size of the binary $extra_libs .= ' --disable-lzma --disable-zstd --disable-webp --disable-libdeflate'; - $shell = shell()->cd($this->source_dir)->initLibBuildEnv($this) + $shell = shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static --disable-shared ' . diff --git a/src/SPC/builder/unix/library/libxslt.php b/src/SPC/builder/unix/library/libxslt.php index f0d2592f..b241d715 100644 --- a/src/SPC/builder/unix/library/libxslt.php +++ b/src/SPC/builder/unix/library/libxslt.php @@ -24,7 +24,7 @@ trait libxslt $required_libs .= ' ' . $dep->getStaticLibFiles(); } } - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv([ 'CFLAGS' => "-I{$this->getIncludeDir()}", 'LDFLAGS' => "-L{$this->getLibDir()}", diff --git a/src/SPC/builder/unix/library/ncurses.php b/src/SPC/builder/unix/library/ncurses.php index 42b4f2d3..7d33c76a 100644 --- a/src/SPC/builder/unix/library/ncurses.php +++ b/src/SPC/builder/unix/library/ncurses.php @@ -11,7 +11,7 @@ trait ncurses protected function build(): void { $filelist = FileSystem::scanDirFiles(BUILD_BIN_PATH, relative: true); - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/unix/library/nghttp2.php b/src/SPC/builder/unix/library/nghttp2.php index d8f4dc29..03c883bf 100644 --- a/src/SPC/builder/unix/library/nghttp2.php +++ b/src/SPC/builder/unix/library/nghttp2.php @@ -40,7 +40,7 @@ trait nghttp2 [,,$destdir] = SEPARATED_PATH; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/unix/library/nghttp3.php b/src/SPC/builder/unix/library/nghttp3.php index 4c1c8284..95cc22bf 100644 --- a/src/SPC/builder/unix/library/nghttp3.php +++ b/src/SPC/builder/unix/library/nghttp3.php @@ -15,7 +15,7 @@ trait nghttp3 */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/unix/library/ngtcp2.php b/src/SPC/builder/unix/library/ngtcp2.php index 66ba1306..97a0a8af 100644 --- a/src/SPC/builder/unix/library/ngtcp2.php +++ b/src/SPC/builder/unix/library/ngtcp2.php @@ -30,7 +30,7 @@ trait ngtcp2 $args .= ' --with-libbrotlienc=yes LIBBROTLIENC_CFLAGS="-I' . BUILD_ROOT_PATH . '/include" LIBBROTLIENC_LIBS="' . $brotli->getStaticLibFiles() . '"'; } - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static ' . diff --git a/src/SPC/builder/unix/library/onig.php b/src/SPC/builder/unix/library/onig.php index 380e05b2..0ff844db 100644 --- a/src/SPC/builder/unix/library/onig.php +++ b/src/SPC/builder/unix/library/onig.php @@ -17,7 +17,7 @@ trait onig { [,,$destdir] = SEPARATED_PATH; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec('./configure --enable-static --disable-shared --prefix=') ->exec('make clean') ->exec("make -j{$this->builder->concurrency}") diff --git a/src/SPC/builder/unix/library/pkgconfig.php b/src/SPC/builder/unix/library/pkgconfig.php index 5fc89113..51fa586b 100644 --- a/src/SPC/builder/unix/library/pkgconfig.php +++ b/src/SPC/builder/unix/library/pkgconfig.php @@ -13,7 +13,7 @@ trait pkgconfig $cflags = PHP_OS_FAMILY !== 'Linux' ? "{$this->builder->arch_c_flags} -Wimplicit-function-declaration -Wno-int-conversion" : ''; $ldflags = !($this instanceof LinuxLibraryBase) || getenv('SPC_LIBC') === 'glibc' ? '' : '--static'; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->appendEnv(['CFLAGS' => $cflags, 'LDFLAGS' => $ldflags]) ->exec( './configure ' . diff --git a/src/SPC/builder/unix/library/readline.php b/src/SPC/builder/unix/library/readline.php index a7339d60..c0fe9078 100644 --- a/src/SPC/builder/unix/library/readline.php +++ b/src/SPC/builder/unix/library/readline.php @@ -15,7 +15,7 @@ trait readline */ protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec( './configure ' . '--enable-static=yes ' . diff --git a/src/SPC/builder/unix/library/sqlite.php b/src/SPC/builder/unix/library/sqlite.php index 42e23679..c6219171 100644 --- a/src/SPC/builder/unix/library/sqlite.php +++ b/src/SPC/builder/unix/library/sqlite.php @@ -8,7 +8,7 @@ trait sqlite { protected function build(): void { - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec('./configure --enable-static --disable-shared --prefix=') ->exec('make clean') ->exec("make -j{$this->builder->concurrency}") diff --git a/src/SPC/builder/unix/library/zlib.php b/src/SPC/builder/unix/library/zlib.php index f2490a6c..8accaf66 100644 --- a/src/SPC/builder/unix/library/zlib.php +++ b/src/SPC/builder/unix/library/zlib.php @@ -17,7 +17,7 @@ trait zlib { [,,$destdir] = SEPARATED_PATH; - shell()->cd($this->source_dir)->initLibBuildEnv($this) + shell()->cd($this->source_dir)->initializeEnv($this) ->exec('./configure --static --prefix=') ->exec('make clean') ->exec("make -j{$this->builder->concurrency}") diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php index 9dd779a7..957d66a6 100644 --- a/src/SPC/util/UnixShell.php +++ b/src/SPC/util/UnixShell.php @@ -64,7 +64,7 @@ class UnixShell * * @param BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library Library class */ - public function initLibBuildEnv(BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library): UnixShell + public function initializeEnv(BSDLibraryBase|LinuxLibraryBase|MacOSLibraryBase $library): UnixShell { $this->setEnv([ 'CFLAGS' => $library->getLibExtraCFlags(), diff --git a/src/SPC/util/executor/UnixCMakeExecutor.php b/src/SPC/util/executor/UnixCMakeExecutor.php index 9cb0d52d..ed9331e6 100644 --- a/src/SPC/util/executor/UnixCMakeExecutor.php +++ b/src/SPC/util/executor/UnixCMakeExecutor.php @@ -34,7 +34,7 @@ class UnixCMakeExecutor extends Executor } // prepare shell - $shell = shell()->cd($this->build_dir)->initLibBuildEnv($this->library); + $shell = shell()->cd($this->build_dir)->initializeEnv($this->library); // config $this->steps >= 1 && $shell->exec("cmake {$this->getConfigureArgs()} {$this->getDefaultCMakeArgs()} {$build_pos}");