add micro:combine command

README-en.md

@@ -104,7 +104,7 @@ Basic usage for building php and micro with some extensions:
 cd static-php-cli
 composer update
 chmod +x bin/spc
-# Check system tool dependencies, fix them automatically (only support macOS) (TODO: Linux distro support)
+# Check system tool dependencies, fix them automatically
 ./bin/spc doctor
 # fetch all libraries
 ./bin/spc fetch --all

README.md

@@ -98,7 +98,7 @@ chmod +x bin/setup-runtime
 cd static-php-cli
 composer update
 chmod +x bin/spc
-# 检查环境依赖，并根据提示的命令安装缺失的编译工具（目前仅支持 macOS，Linux 后续会支持）
+# 检查环境依赖，并根据提示的命令安装缺失的编译工具
 ./bin/spc doctor
 # 拉取所有依赖库
 ./bin/spc fetch --all

src/SPC/builder/macos/library/libpng.php

@@ -40,6 +40,7 @@ class libpng extends MacOSLibraryBase
         };
         shell()->cd($this->source_dir)
             ->exec('chmod +x ./configure')
+            ->exec('chmod +x ./install-sh')
             ->exec(
                 "{$this->builder->configure_env} ./configure " .
                 "--host={$this->builder->gnu_arch}-apple-darwin " .

src/SPC/command/DoctorCommand.php

@@ -10,11 +10,16 @@ use Symfony\Component\Console\Attribute\AsCommand;
 #[AsCommand('doctor', 'Diagnose whether the current environment can compile normally')]
 class DoctorCommand extends BaseCommand
 {
+    public function configure()
+    {
+        $this->addOption('auto-fix', null, null, 'Automatically fix failed items (if possible)');
+    }
+
     public function handle(): int
     {
         try {
             $checker = new CheckListHandler($this->input, $this->output);
-            $checker->runCheck(FIX_POLICY_PROMPT);
+            $checker->runCheck($this->input->getOption('auto-fix') ? FIX_POLICY_AUTOFIX : FIX_POLICY_PROMPT);
             $this->output->writeln('<info>Doctor check complete !</info>');
         } catch (\Throwable $e) {
             $this->output->writeln('<error>' . $e->getMessage() . '</error>');

src/SPC/command/DownloadCommand.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\command;
 
+use SPC\builder\traits\UnixSystemUtilTrait;
 use SPC\exception\DownloaderException;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -18,6 +19,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 #[AsCommand('download', 'Download required sources', ['fetch'])]
 class DownloadCommand extends BaseCommand
 {
+    use UnixSystemUtilTrait;
+
     protected string $php_major_ver;
 
     public function configure()
@@ -28,12 +31,13 @@ class DownloadCommand extends BaseCommand
         $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format like 8.1', '8.1');
         $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('from-zip', 'Z', InputOption::VALUE_REQUIRED, 'Fetch from zip archive');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output)
     {
         // --all 等于 "" ""，也就是所有东西都要下载
-        if ($input->getOption('all') || $input->getOption('clean')) {
+        if ($input->getOption('all') || $input->getOption('clean') || $input->getOption('from-zip')) {
             $input->setArgument('sources', '');
         }
         parent::initialize($input, $output);
@@ -66,6 +70,44 @@ class DownloadCommand extends BaseCommand
             return 0;
         }
 
+        // --from-zip
+        if ($path = $this->getOption('from-zip')) {
+            if (!file_exists($path)) {
+                logger()->critical('File ' . $path . ' not exist or not a zip archive.');
+                return 1;
+            }
+            // remove old download files first
+            if (is_dir(DOWNLOAD_PATH)) {
+                logger()->warning('You are doing some operations that not recoverable: removing directories below');
+                logger()->warning(DOWNLOAD_PATH);
+                logger()->alert('I will remove these dir after 5 seconds !');
+                sleep(5);
+                f_passthru((PHP_OS_FAMILY === 'Windows' ? 'rmdir /s /q ' : 'rm -rf ') . DOWNLOAD_PATH);
+            }
+            // unzip command check
+            if (PHP_OS_FAMILY !== 'Windows' && !$this->findCommand('unzip')) {
+                logger()->critical('Missing unzip command, you need to install it first !');
+                logger()->critical('You can use "bin/spc doctor" command to check and install required tools');
+                return 1;
+            }
+            // create downloads
+            try {
+                if (PHP_OS_FAMILY !== 'Windows') {
+                    f_passthru('mkdir ' . DOWNLOAD_PATH . ' && cd ' . DOWNLOAD_PATH . ' && unzip ' . escapeshellarg($path));
+                }
+                // Windows TODO
+
+                if (!file_exists(DOWNLOAD_PATH . '/.lock.json')) {
+                    throw new RuntimeException('.lock.json not exist in "downloads/"');
+                }
+            } catch (RuntimeException $e) {
+                logger()->critical('Extract failed: ' . $e->getMessage());
+                return 1;
+            }
+            logger()->info('Extract success');
+            return 0;
+        }
+
         // Define PHP major version
         $ver = $this->php_major_ver = $this->getOption('with-php') ?? '8.1';
         define('SPC_BUILD_PHP_VERSION', $ver);

src/SPC/command/MicroCombineCommand.php

@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\command;
+
+use SPC\store\FileSystem;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+#[AsCommand('micro:combine', 'Combine micro.sfx and php code together')]
+class MicroCombineCommand extends BaseCommand
+{
+    public function configure()
+    {
+        $this->addArgument('file', InputArgument::REQUIRED, 'The php or phar file to be combined');
+        $this->addOption('with-micro', 'M', InputOption::VALUE_REQUIRED, 'Customize your micro.sfx file');
+        $this->addOption('with-ini-set', 'I', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'ini to inject into micro.sfx when combining');
+        $this->addOption('with-ini-file', 'N', InputOption::VALUE_REQUIRED, 'ini file to inject into micro.sfx when combining');
+        $this->addOption('output', 'O', InputOption::VALUE_REQUIRED, 'Customize your output binary file name');
+    }
+
+    public function handle(): int
+    {
+        // 0. Initialize path variables
+        $internal = FileSystem::convertPath(BUILD_ROOT_PATH . '/bin/micro.sfx');
+        $micro_file = $this->input->getOption('with-micro');
+        $file = $this->getArgument('file');
+        $ini_set = $this->input->getOption('with-ini-set');
+        $ini_file = $this->input->getOption('with-ini-file');
+        $target_ini = [];
+        $output = $this->input->getOption('output') ?? 'my-app';
+        $ini_part = '';
+        // 1. Make sure specified micro.sfx file exists
+        if ($micro_file !== null && !file_exists($micro_file)) {
+            $this->output->writeln('<error>The micro.sfx file you specified is incorrect or does not exist!</error>');
+            return 1;
+        }
+        // 2. Make sure buildroot/bin/micro.sfx exists
+        if ($micro_file === null && !file_exists($internal)) {
+            $this->output->writeln('<error>You haven\'t compiled micro.sfx yet, please use "build" command and "--build-micro" to compile phpmicro first!</error>');
+            return 1;
+        }
+        // 3. Use buildroot/bin/micro.sfx
+        if ($micro_file === null) {
+            $micro_file = $internal;
+        }
+        // 4. Make sure php or phar file exists
+        if (!is_file(FileSystem::convertPath($file))) {
+            $this->output->writeln('<error>The file to combine does not exist!</error>');
+            return 1;
+        }
+        // 5. Confirm ini files (ini-set has higher priority)
+        if ($ini_file !== null) {
+            // Check file exist first
+            if (!file_exists($ini_file)) {
+                $this->output->writeln('<error>The ini file to combine does not exist! (' . $ini_file . ')</error>');
+                return 1;
+            }
+            $arr = parse_ini_file($ini_file);
+            if ($arr === false) {
+                $this->output->writeln('<error>Cannot parse ini file</error>');
+                return 1;
+            }
+            $target_ini = array_merge($target_ini, $arr);
+        }
+        // 6. Confirm ini sets
+        if ($ini_set !== []) {
+            foreach ($ini_set as $item) {
+                $arr = parse_ini_string($item);
+                if ($arr === false) {
+                    $this->output->writeln('<error>--with-ini-set parse failed</error>');
+                    return 1;
+                }
+                $target_ini = array_merge($target_ini, $arr);
+            }
+        }
+        // 7. Generate ini injection parts
+        if (!empty($target_ini)) {
+            $ini_str = $this->encodeINI($target_ini);
+            logger()->debug('Injecting ini parts: ' . PHP_EOL . $ini_str);
+            $ini_part = "\xfd\xf6\x69\xe6";
+            $ini_part .= pack('N', strlen($ini_str));
+            $ini_part .= $ini_str;
+        }
+        // 8. Combine !
+        $output = FileSystem::isRelativePath($output) ? (WORKING_DIR . '/' . $output) : $output;
+        $file_target = file_get_contents($micro_file) . $ini_part . file_get_contents($file);
+        $result = file_put_contents($output, $file_target);
+        if ($result === false) {
+            $this->output->writeln('<error>Combine failed.</error>');
+            return 1;
+        }
+        // 9. chmod +x
+        chmod($output, 0755);
+        $this->output->writeln('<info>Combine success! Binary file: ' . $output . '</info>');
+        return 0;
+    }
+
+    private function encodeINI(array $array): string
+    {
+        $res = [];
+        foreach ($array as $key => $val) {
+            if (is_array($val)) {
+                $res[] = "[{$key}]";
+                foreach ($val as $skey => $sval) {
+                    $res[] = "{$skey}=" . (is_numeric($sval) ? $sval : '"' . $sval . '"');
+                }
+            } else {
+                $res[] = "{$key}=" . (is_numeric($val) ? $val : '"' . $val . '"');
+            }
+        }
+        return implode("\n", $res);
+    }
+}

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -15,25 +15,29 @@ class LinuxToolCheckList
 {
     use UnixSystemUtilTrait;
 
+    public const TOOLS_ALPINE = [
+        'make', 'bison', 'flex',
+        'git', 'autoconf', 'automake',
+        'tar', 'unzip', 'gzip',
+        'bzip2', 'cmake', 'gcc',
+        'g++', 'patch',
+    ];
+
+    public const TOOLS_DEBIAN = [
+        'make', 'bison', 'flex',
+        'git', 'autoconf', 'automake',
+        'tar', 'unzip', 'gzip',
+        'bzip2', 'cmake', 'patch',
+    ];
+
     #[AsCheckItem('if necessary tools are installed', limit_os: 'Linux')]
     public function checkCliTools(): ?CheckResult
     {
         $distro = SystemUtil::getOSRelease();
 
         $required = match ($distro['dist']) {
-            'alpine' => [
-                'make', 'bison', 'flex',
-                'git', 'autoconf', 'automake',
-                'tar', 'unzip', 'gzip',
-                'bzip2', 'cmake', 'gcc',
-                'g++',
-            ],
-            default => [
-                'make', 'bison', 'flex',
-                'git', 'autoconf', 'automake',
-                'tar', 'unzip', 'gzip',
-                'bzip2', 'cmake',
-            ],
+            'alpine' => self::TOOLS_ALPINE,
+            default => self::TOOLS_DEBIAN,
         };
         $missing = [];
         foreach ($required as $cmd) {
@@ -50,6 +54,19 @@ class LinuxToolCheckList
         return CheckResult::ok();
     }
 
+    #[AsCheckItem('if necessary packages are installed', limit_os: 'Linux')]
+    public function checkSystemOSPackages(): ?CheckResult
+    {
+        $distro = SystemUtil::getOSRelease();
+        if ($distro['dist'] === 'alpine') {
+            // check linux-headers installation
+            if (!file_exists('/usr/include/linux/mman.h')) {
+                return CheckResult::fail('linux-headers not installed on your system', 'install-linux-tools', [$distro, ['linux-headers']]);
+            }
+        }
+        return CheckResult::ok();
+    }
+
     #[AsFixItem('install-linux-tools')]
     public function fixBuildTools(array $distro, array $missing): bool
     {

src/SPC/store/FileSystem.php

@@ -439,6 +439,20 @@ class FileSystem
         self::$_extract_hook[$name][] = $callback;
     }
 
+    /**
+     * Check whether the path is a relative path (judging according to whether the first character is "/")
+     *
+     * @param string $path Path
+     */
+    public static function isRelativePath(string $path): bool
+    {
+        // 适配 Windows 的多盘符目录形式
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return !(strlen($path) > 2 && ctype_alpha($path[0]) && $path[1] === ':');
+        }
+        return strlen($path) > 0 && $path[0] !== '/';
+    }
+
     private static function emitSourceExtractHook(string $name)
     {
         foreach ((self::$_extract_hook[$name] ?? []) as $hook) {