fix mongodb release file match

config/source.json

@@ -323,7 +323,7 @@
         "type": "ghrel",
         "repo": "mongodb/mongo-php-driver",
         "path": "php-src/ext/mongodb",
-        "match": "mongodb.+\\.zip",
+        "match": "mongodb.+\\.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"

src/SPC/builder/BuilderBase.php

@@ -148,14 +148,12 @@ abstract class BuilderBase
     {
         // judge cpp-extension
         $exts = array_keys($this->getExts());
-        $cpp = false;
         foreach ($exts as $ext) {
             if (Config::getExt($ext, 'cpp-extension', false) === true) {
-                $cpp = true;
-                break;
+                return true;
             }
         }
-        return $cpp;
+        return false;
     }
 
     /**

src/SPC/builder/LibraryBase.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -19,6 +18,8 @@ abstract class LibraryBase
 
     protected array $dependencies = [];
 
+    protected bool $patched = false;
+
     /**
      * @throws RuntimeException
      */
@@ -130,10 +131,15 @@ abstract class LibraryBase
      */
     public function tryBuild(bool $force_build = false): int
     {
+        if (file_exists($this->source_dir . '/.spc.patched')) {
+            $this->patched = true;
+        }
         // force means just build
         if ($force_build) {
             logger()->info('Building required library [' . static::NAME . ']');
-            $this->patchBeforeBuild();
+            if (!$this->patched && $this->patchBeforeBuild()) {
+                file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
+            }
             $this->build();
             return BUILD_STATUS_OK;
         }
@@ -153,7 +159,7 @@ abstract class LibraryBase
             }
         }
         // pkg-config is treated specially. If it is pkg-config, check if the pkg-config binary exists
-        if ($this instanceof MacOSLibraryBase && static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
+        if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
             $this->tryBuild(true);
             return BUILD_STATUS_OK;
         }

src/SPC/builder/linux/SystemUtil.php

@@ -20,6 +20,19 @@ class SystemUtil
             'ver' => 'unknown',
         ];
         switch (true) {
+            case file_exists('/etc/centos-release'):
+                $lines = file('/etc/centos-release');
+                goto rh;
+            case file_exists('/etc/redhat-release'):
+                $lines = file('/etc/redhat-release');
+                rh:
+                foreach ($lines as $line) {
+                    if (preg_match('/release\s+(\d*(\.\d+)*)/', $line, $matches)) {
+                        $ret['dist'] = 'redhat';
+                        $ret['ver'] = $matches[1];
+                    }
+                }
+                break;
             case file_exists('/etc/os-release'):
                 $lines = file('/etc/os-release');
                 foreach ($lines as $line) {
@@ -36,19 +49,6 @@ class SystemUtil
                     $ret['dist'] = 'redhat';
                 }
                 break;
-            case file_exists('/etc/centos-release'):
-                $lines = file('/etc/centos-release');
-                goto rh;
-            case file_exists('/etc/redhat-release'):
-                $lines = file('/etc/redhat-release');
-                rh:
-                foreach ($lines as $line) {
-                    if (preg_match('/release\s+(\d+(\.\d+)*)/', $line, $matches)) {
-                        $ret['dist'] = 'redhat';
-                        $ret['ver'] = $matches[1];
-                    }
-                }
-                break;
         }
         return $ret;
     }

src/SPC/builder/linux/library/LinuxLibraryBase.php

@@ -8,9 +8,6 @@ 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,44 +34,6 @@ abstract class LinuxLibraryBase extends LibraryBase
         return $this->builder;
     }
 
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
-    public function tryBuild(bool $force_build = false): int
-    {
-        // 传入 true，表明直接编译
-        if ($force_build) {
-            logger()->info('Building required library [' . static::NAME . ']');
-            $this->patchBeforeBuild();
-            $this->build();
-            return BUILD_STATUS_OK;
-        }
-
-        // 看看这些库是不是存在，如果不存在，则调用编译并返回结果状态
-        foreach ($this->getStaticLibs() as $name) {
-            if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
-                $this->tryBuild(true);
-                return BUILD_STATUS_OK;
-            }
-        }
-        // 头文件同理
-        foreach ($this->getHeaders() as $name) {
-            if (!file_exists(BUILD_INCLUDE_PATH . "/{$name}")) {
-                $this->tryBuild(true);
-                return BUILD_STATUS_OK;
-            }
-        }
-        // pkg-config 做特殊处理，如果是 pkg-config 就检查有没有 pkg-config 二进制
-        if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
-            $this->tryBuild(true);
-            return BUILD_STATUS_OK;
-        }
-        // 到这里说明所有的文件都存在，就跳过编译
-        return BUILD_STATUS_ALREADY;
-    }
-
     protected function makeFakePkgconfs(): void
     {
         $workspace = BUILD_ROOT_PATH;

src/SPC/command/BuildCliCommand.php

@@ -7,6 +7,7 @@ namespace SPC\command;
 use SPC\builder\BuilderProvider;
 use SPC\exception\ExceptionHandler;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 use SPC\util\DependencyUtil;
 use SPC\util\LicenseDumper;
@@ -70,6 +71,10 @@ class BuildCliCommand extends BuildCommand
                 logger()->warning('some extensions will be enabled due to dependencies: ' . implode(',', $not_included));
             }
             sleep(2);
+            if ($this->input->getOption('with-clean')) {
+                logger()->info('Cleaning source dir...');
+                FileSystem::removeDir(SOURCE_PATH);
+            }
             // compile libraries
             $builder->buildLibs($libraries);
             // check extensions

src/SPC/command/BuildCommand.php

@@ -28,7 +28,7 @@ abstract class BuildCommand extends BaseCommand
                 break;
         }
 
-        $this->addOption('with-clean', null, null, 'fresh build, `make clean` before `make`');
+        $this->addOption('with-clean', null, null, 'fresh build, remove `source` dir before `make`');
         $this->addOption('bloat', null, null, 'add all libraries into binary');
     }
 }

src/SPC/command/DownloadCommand.php

@@ -28,7 +28,7 @@ class DownloadCommand extends BaseCommand
         $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
         $this->addOption('shallow-clone', null, null, 'Clone shallow');
         $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format like 8.1', '8.1');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.2)', '8.2');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
         $this->addOption('all', 'A', null, 'Fetch all sources that static-php-cli needed');
         $this->addOption('custom-url', 'U', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Specify custom source download url, e.g "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"');

src/SPC/store/FileSystem.php

@@ -55,7 +55,7 @@ class FileSystem
     /**
      * @throws FileSystemException
      */
-    public static function replaceFileStr(string $filename, mixed $search = null, mixed $replace = null): bool|int
+    public static function replaceFileStr(string $filename, mixed $search = null, mixed $replace = null): false|int
     {
         return self::replaceFile($filename, REPLACE_FILE_STR, $search, $replace);
     }
@@ -63,7 +63,7 @@ class FileSystem
     /**
      * @throws FileSystemException
      */
-    public static function replaceFileRegex(string $filename, mixed $search = null, mixed $replace = null): bool|int
+    public static function replaceFileRegex(string $filename, mixed $search = null, mixed $replace = null): false|int
     {
         return self::replaceFile($filename, REPLACE_FILE_PREG, $search, $replace);
     }
@@ -71,7 +71,7 @@ class FileSystem
     /**
      * @throws FileSystemException
      */
-    public static function replaceFileUser(string $filename, mixed $callback = null): bool|int
+    public static function replaceFileUser(string $filename, mixed $callback = null): false|int
     {
         return self::replaceFile($filename, REPLACE_FILE_USER, $callback);
     }
@@ -163,7 +163,6 @@ class FileSystem
                 self::emitSourceExtractHook($name);
                 return;
             }
-
             if (PHP_OS_FAMILY === 'Darwin' || PHP_OS_FAMILY === 'Linux') {
                 if (f_mkdir(directory: $target, recursive: true) !== true) {
                     throw new FileSystemException('create ' . $name . 'source dir failed');
@@ -256,14 +255,13 @@ class FileSystem
     /**
      * 递归或非递归扫描目录，可返回相对目录的文件列表或绝对目录的文件列表
      *
-     * @param  string      $dir         目录
-     * @param  bool        $recursive   是否递归扫描子目录
-     * @param  bool|string $relative    是否返回相对目录，如果为true则返回相对目录，如果为false则返回绝对目录
-     * @param  bool        $include_dir 非递归模式下，是否包含目录
-     * @return array|false
+     * @param string      $dir         目录
+     * @param bool        $recursive   是否递归扫描子目录
+     * @param bool|string $relative    是否返回相对目录，如果为true则返回相对目录，如果为false则返回绝对目录
+     * @param bool        $include_dir 非递归模式下，是否包含目录
      * @since 2.5
      */
-    public static function scanDirFiles(string $dir, bool $recursive = true, bool|string $relative = false, bool $include_dir = false): bool|array
+    public static function scanDirFiles(string $dir, bool $recursive = true, bool|string $relative = false, bool $include_dir = false): array|false
     {
         $dir = self::convertPath($dir);
         // 不是目录不扫，直接 false 处理
@@ -403,7 +401,7 @@ class FileSystem
      * @param  mixed               ...$args Arguments passed to file_put_contents
      * @throws FileSystemException
      */
-    public static function writeFile(string $path, mixed $content, ...$args): bool|string|int
+    public static function writeFile(string $path, mixed $content, ...$args): bool|int|string
     {
         $dir = pathinfo($path, PATHINFO_DIRNAME);
         if (!is_dir($dir) && !mkdir($dir, 0755, true)) {
@@ -446,7 +444,7 @@ class FileSystem
     /**
      * @throws FileSystemException
      */
-    private static function replaceFile(string $filename, int $replace_type = REPLACE_FILE_STR, mixed $callback_or_search = null, mixed $to_replace = null): bool|int
+    private static function replaceFile(string $filename, int $replace_type = REPLACE_FILE_STR, mixed $callback_or_search = null, mixed $to_replace = null): false|int
     {
         logger()->debug('Replacing file with type[' . $replace_type . ']: ' . $filename);
         $file = self::readFile($filename);

src/SPC/store/SourceExtractor.php

@@ -52,7 +52,7 @@ class SourceExtractor
         // start check
         foreach ($sources_extracted as $source => $item) {
             if (Config::getSource($source) === null) {
-                throw new WrongUsageException("Source [{$source}] not exists, please check name and correct it !");
+                throw new WrongUsageException("Source [{$source}] does not exist, please check the name and correct it !");
             }
             if (!isset($lock[$source])) {
                 throw new WrongUsageException('Source [' . $source . '] not downloaded or not locked, you should download it first !');

src/SPC/store/SourcePatcher.php

@@ -117,6 +117,30 @@ class SourcePatcher
         return true;
     }
 
+    /**
+     * Use existing patch file for patching
+     *
+     * @param  string           $patch_name Patch file name in src/globals/patch/
+     * @param  string           $cwd        Working directory for patch command
+     * @param  bool             $reverse    Reverse patches (default: False)
+     * @throws RuntimeException
+     */
+    public static function patchFile(string $patch_name, string $cwd, bool $reverse = false): bool
+    {
+        if (!file_exists(ROOT_DIR . "/src/globals/patch/{$patch_name}")) {
+            return false;
+        }
+
+        $patch_file = ROOT_DIR . "/src/globals/patch/{$patch_name}";
+        $patch_str = str_replace('/', DIRECTORY_SEPARATOR, $patch_file);
+
+        f_passthru(
+            'cd ' . $cwd . ' && ' .
+            (PHP_OS_FAMILY === 'Windows' ? 'type' : 'cat') . ' ' . $patch_str . ' | patch -p1 ' . ($reverse ? '-R' : '')
+        );
+        return true;
+    }
+
     /**
      * @throws FileSystemException
      */