Do some code quality check and fix #126

2026-07-05 15:55:39 +08:00 · 2023-08-20 19:51:45 +08:00
parent 9c57ed6439
commit c8fa767576
104 changed files with 1040 additions and 785 deletions
--- a/src/SPC/builder/linux/library/LinuxLibraryBase.php
+++ b/src/SPC/builder/linux/library/LinuxLibraryBase.php
@@ -8,7 +8,9 @@ use SPC\builder\BuilderBase;
 use SPC\builder\LibraryBase;
 use SPC\builder\linux\LinuxBuilder;
 use SPC\builder\traits\UnixLibraryTrait;
+use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;

 abstract class LinuxLibraryBase extends LibraryBase
 {
@@ -37,6 +39,8 @@ abstract class LinuxLibraryBase extends LibraryBase

    /**
     * @throws RuntimeException
+     * @throws FileSystemException
+     * @throws WrongUsageException
     */
    public function tryBuild(bool $force_build = false): int
    {
@@ -71,7 +75,7 @@ abstract class LinuxLibraryBase extends LibraryBase
        return BUILD_STATUS_ALREADY;
    }

-    protected function makeFakePkgconfs()
+    protected function makeFakePkgconfs(): void
    {
        $workspace = BUILD_ROOT_PATH;
        if ($workspace === '/') {
--- a/src/SPC/builder/linux/library/icu.php
+++ b/src/SPC/builder/linux/library/icu.php
@@ -8,7 +8,7 @@ class icu extends LinuxLibraryBase
 {
    public const NAME = 'icu';

-    protected function build()
+    protected function build(): void
    {
        $root = BUILD_ROOT_PATH;
        $cppflag = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
--- a/src/SPC/builder/linux/library/libpng.php
+++ b/src/SPC/builder/linux/library/libpng.php
@@ -23,24 +23,26 @@ namespace SPC\builder\linux\library;
 use SPC\builder\linux\SystemUtil;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;

 class libpng extends LinuxLibraryBase
 {
    public const NAME = 'libpng';

+    /**
+     * @throws FileSystemException
+     */
    public function patchBeforeBuild(): bool
    {
-        FileSystem::replaceFile(
+        FileSystem::replaceFileStr(
            SOURCE_PATH . '/libpng/configure',
-            REPLACE_FILE_STR,
            '-lz',
            BUILD_LIB_PATH . '/libz.a'
        );
        if (SystemUtil::getOSRelease()['dist'] === 'alpine') {
-            FileSystem::replaceFile(
+            FileSystem::replaceFileStr(
                SOURCE_PATH . '/libpng/configure',
-                REPLACE_FILE_STR,
                '-lm',
                '/usr/lib/libm.a'
            );
@@ -49,12 +51,13 @@ class libpng extends LinuxLibraryBase
    }

    /**
-     * @throws RuntimeException
     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
     */
-    public function build()
+    public function build(): void
    {
-        $optimizations = match ($this->builder->arch) {
+        $optimizations = match ($this->builder->getOption('arch')) {
            'x86_64' => '--enable-intel-sse ',
            'arm64' => '--enable-arm-neon ',
            default => '',
@@ -64,7 +67,7 @@ class libpng extends LinuxLibraryBase
            ->exec('chmod +x ./install-sh')
            ->exec(
                "{$this->builder->configure_env} ./configure " .
-                "--host={$this->builder->gnu_arch}-unknown-linux " .
+                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
                '--disable-shared ' .
                '--enable-static ' .
                '--enable-hardware-optimizations ' .
--- a/src/SPC/builder/linux/library/libxml2.php
+++ b/src/SPC/builder/linux/library/libxml2.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace SPC\builder\linux\library;

+use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;

@@ -13,14 +14,15 @@ class libxml2 extends LinuxLibraryBase

    /**
     * @throws RuntimeException
+     * @throws FileSystemException
     */
-    public function build()
+    public function build(): void
    {
        $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
        $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
        $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';

-        [$lib, $include, $destdir] = SEPARATED_PATH;
+        [, , $destdir] = SEPARATED_PATH;

        FileSystem::resetDir($this->source_dir . '/build');
        shell()->cd($this->source_dir . '/build')
--- a/src/SPC/builder/linux/library/nghttp2.php
+++ b/src/SPC/builder/linux/library/nghttp2.php
@@ -20,11 +20,20 @@ declare(strict_types=1);

 namespace SPC\builder\linux\library;

+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+
 class nghttp2 extends LinuxLibraryBase
 {
    public const NAME = 'nghttp2';

-    public function build()
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    public function build(): void
    {
        $args = $this->builder->makeAutoconfArgs(static::NAME, [
            'zlib' => null,
@@ -49,7 +58,7 @@ class nghttp2 extends LinuxLibraryBase
                "{$this->builder->configure_env} ./configure " .
                '--enable-static ' .
                '--disable-shared ' .
-                "--host={$this->builder->gnu_arch}-unknown-linux " .
+                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
                '--enable-lib-only ' .
                '--with-boost=no ' .
                $args . ' ' .
--- a/src/SPC/builder/linux/library/openssl.php
+++ b/src/SPC/builder/linux/library/openssl.php
@@ -23,26 +23,28 @@ namespace SPC\builder\linux\library;
 use SPC\builder\linux\SystemUtil;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;

 class openssl extends LinuxLibraryBase
 {
    public const NAME = 'openssl';

    /**
-     * @throws RuntimeException
     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
     */
-    public function build()
+    public function build(): void
    {
-        [$lib,$include,$destdir] = SEPARATED_PATH;
+        [,,$destdir] = SEPARATED_PATH;

        $extra = '';
        $ex_lib = '-ldl -pthread';

        $env = $this->builder->pkgconf_env . " CFLAGS='{$this->builder->arch_c_flags}'";
-        $env .= " CC='{$this->builder->cc} -static -idirafter " . BUILD_INCLUDE_PATH .
+        $env .= " CC='{$this->builder->getOption('cc')} -static -idirafter " . BUILD_INCLUDE_PATH .
            ' -idirafter /usr/include/ ' .
-            ' -idirafter /usr/include/' . $this->builder->arch . '-linux-gnu/ ' .
+            ' -idirafter /usr/include/' . $this->builder->getOption('arch') . '-linux-gnu/ ' .
            "' ";
        // lib:zlib
        $zlib = $this->builder->getLib('zlib');
@@ -58,7 +60,7 @@ class openssl extends LinuxLibraryBase

        $ex_lib = trim($ex_lib);

-        $clang_postfix = SystemUtil::getCCType($this->builder->cc) === 'clang' ? '-clang' : '';
+        $clang_postfix = SystemUtil::getCCType($this->builder->getOption('cc')) === 'clang' ? '-clang' : '';

        shell()->cd($this->source_dir)
            ->exec(
@@ -68,7 +70,7 @@ class openssl extends LinuxLibraryBase
                '-static ' .
                "{$zlib_extra}" .
                'no-legacy ' .
-                "linux-{$this->builder->arch}{$clang_postfix}"
+                "linux-{$this->builder->getOption('arch')}{$clang_postfix}"
            )
            ->exec('make clean')
            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")