Add libtiff support (#361)

* add libtiff support

* fix command option not working on *nix

* fix test with libs ext test

.github/workflows/release-build.yml

@@ -70,10 +70,10 @@ jobs:
           
       - name: "Generate Executable"
         run: |
+          bin/spc micro:combine spc.phar -M micro.sfx -O spc -I "memory_limit=2G"
           if [ "${{ matrix.operating-system }}" = "windows-x64" ]; then
-            cat micro.sfx spc.phar > spc.exe
+            mv spc spc.exe
           else
-            cat micro.sfx spc.phar > spc
             chmod +x spc
           fi
 

config/ext.json

@@ -63,8 +63,11 @@
     "ffi": {
         "arg-type": "custom",
         "type": "builtin",
-        "lib-depends": [
+        "lib-depends-unix": [
             "libffi"
+        ],
+        "lib-depends-windows": [
+            "libffi-win"
         ]
     },
     "fileinfo": {

config/lib.json

@@ -147,7 +147,8 @@
             "libpng",
             "libjpeg",
             "libwebp",
-            "freetype"
+            "freetype",
+            "libtiff"
         ],
         "lib-suggests": [
             "zstd",
@@ -233,6 +234,17 @@
             "ffitarget.h"
         ]
     },
+    "libffi-win": {
+        "source": "libffi-win",
+        "static-libs-windows": [
+            "libffi.lib"
+        ],
+        "headers-windows": [
+            "ffi.h",
+            "ffitarget.h",
+            "fficonfig.h"
+        ]
+    },
     "libiconv": {
         "source": "libiconv",
         "static-libs-unix": [
@@ -319,6 +331,12 @@
             "zlib"
         ]
     },
+    "libtiff": {
+        "source": "libtiff",
+        "static-libs-unix": [
+            "libtiff.a"
+        ]
+    },
     "libuv": {
         "source": "libuv",
         "static-libs-unix": [

config/source.json

@@ -245,6 +245,15 @@
             "path": "LICENSE"
         }
     },
+    "libffi-win": {
+        "type": "git",
+        "rev": "master",
+        "url": "https://github.com/static-php/libffi-win.git",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libiconv": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/gnu/libiconv/",
@@ -316,6 +325,15 @@
             "path": "COPYING"
         }
     },
+    "libtiff": {
+        "type": "filelist",
+        "url": "https://download.osgeo.org/libtiff/",
+        "regex": "/href=\"(?<file>tiff-(?<version>[^\"]+)\\.tar\\.xz)\"/",
+        "license": {
+            "type": "file",
+            "path": "LICENSE.md"
+        }
+    },
     "libuv": {
         "type": "ghtar",
         "repo": "libuv/libuv",
@@ -449,7 +467,7 @@
     },
     "postgresql": {
         "type": "url",
-        "url": "https://ftp.postgresql.org/pub/source/v16.1/postgresql-16.1.tar.gz",
+        "url": "https://ftp.postgresql.org/pub/source/v16.2/postgresql-16.2.tar.bz2",
         "license": {
             "type": "file",
             "path": "COPYRIGHT"

src/SPC/ConsoleApplication.php

@@ -25,7 +25,7 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.1.0';
+    public const VERSION = '2.1.2';
 
     public function __construct()
     {

src/SPC/builder/extension/ffi.php

@@ -14,4 +14,9 @@ class ffi extends Extension
     {
         return '--with-ffi --enable-zend-signals';
     }
+
+    public function getWindowsConfigureArg(): string
+    {
+        return '--with-ffi';
+    }
 }

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libtiff extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libtiff;
+
+    public const NAME = 'libtiff';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libtiff extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libtiff;
+
+    public const NAME = 'libtiff';
+}

src/SPC/builder/unix/library/libtiff.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
+trait libtiff
+{
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static --disable-shared ' .
+                '--disable-cxx ' .
+                '--prefix='
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['libtiff-4.pc']);
+    }
+}

src/SPC/builder/unix/library/postgresql.php

@@ -58,11 +58,17 @@ trait postgresql
 
         FileSystem::resetDir($this->source_dir . '/build');
 
-        # 有静态链接配置  参考文件： src/interfaces/libpq/Makefile
-        shell()->cd($this->source_dir . '/build')
-            ->exec('sed -i.backup "s/invokes exit\'; exit 1;/invokes exit\';/"  ../src/interfaces/libpq/Makefile')
-            ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
-            ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');
+        $version = $this->getVersion();
+        // 16.1 workaround
+        if (version_compare($version, '16.1') >= 0) {
+            # 有静态链接配置  参考文件： src/interfaces/libpq/Makefile
+            shell()->cd($this->source_dir . '/build')
+                ->exec('sed -i.backup "s/invokes exit\'; exit 1;/invokes exit\';/"  ../src/interfaces/libpq/Makefile')
+                ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
+                ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');
+        } else {
+            throw new RuntimeException('Unsupported version for postgresql: ' . $version . ' !');
+        }
 
         // configure
         shell()->cd($this->source_dir . '/build')
@@ -101,4 +107,17 @@ trait postgresql
             ->exec("rm -rf {$builddir}/lib/*.so")
             ->exec("rm -rf {$builddir}/lib/*.dylib");
     }
+
+    private function getVersion(): string
+    {
+        try {
+            $file = FileSystem::readFile($this->source_dir . '/meson.build');
+            if (preg_match("/^\\s+version:\\s?'(.*)'/m", $file, $match)) {
+                return $match[1];
+            }
+            return 'unknown';
+        } catch (FileSystemException) {
+            return 'unknown';
+        }
+    }
 }

src/SPC/builder/windows/WindowsBuilder.php

@@ -85,6 +85,14 @@ class WindowsBuilder extends BuilderBase
             unlink($makefile . '.originfile');
         }
 
+        if (($logo = $this->getOption('with-micro-logo')) !== null) {
+            // realpath
+            $logo = realpath($logo);
+            $micro_logo = '--enable-micro-logo=' . escapeshellarg($logo) . ' ';
+        } else {
+            $micro_logo = '';
+        }
+
         cmd()->cd(SOURCE_PATH . '\php-src')
             ->exec(
                 "{$this->sdk_prefix} configure.bat --task-args \"" .
@@ -94,7 +102,7 @@ class WindowsBuilder extends BuilderBase
                 '--with-extra-includes=' . BUILD_INCLUDE_PATH . ' ' .
                 '--with-extra-libs=' . BUILD_LIB_PATH . ' ' .
                 ($enableCli ? '--enable-cli=yes ' : '--enable-cli=no ') .
-                ($enableMicro ? '--enable-micro=yes ' : '--enable-micro=no ') .
+                ($enableMicro ? ('--enable-micro=yes ' . $micro_logo) : '--enable-micro=no ') .
                 ($enableEmbed ? '--enable-embed=yes ' : '--enable-embed=no ') .
                 "{$this->makeExtensionArgs()} " .
                 $zts .

src/SPC/builder/windows/library/libffi_win.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\builder\windows\SystemUtil;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+class libffi_win extends WindowsLibraryBase
+{
+    public const NAME = 'libffi-win';
+
+    protected function build()
+    {
+        $vs_ver_dir = match (SystemUtil::findVisualStudio()['version']) {
+            'vs17' => '/win32/vs17_x64',
+            'vs16' => '/win32/vs16_x64',
+            default => throw new RuntimeException('Current VS version is not supported yet!'),
+        };
+
+        // start build
+        cmd()->cd($this->source_dir . $vs_ver_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('msbuild'),
+                'libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64'
+            );
+        FileSystem::createDir(BUILD_LIB_PATH);
+        FileSystem::createDir(BUILD_INCLUDE_PATH);
+        copy($this->source_dir . $vs_ver_dir . '\x64\Release\libffi.lib', BUILD_LIB_PATH . '\libffi.lib');
+        copy($this->source_dir . $vs_ver_dir . '\x64\Release\libffi.pdb', BUILD_LIB_PATH . '\libffi.pdb');
+        copy($this->source_dir . '\include\ffi.h', BUILD_INCLUDE_PATH . '\ffi.h');
+
+        FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\ffi.h', '#define LIBFFI_H', "#define LIBFFI_H\n#define FFI_BUILDING");
+        copy($this->source_dir . '\src\x86\ffitarget.h', BUILD_INCLUDE_PATH . '\ffitarget.h');
+        copy($this->source_dir . '\fficonfig.h', BUILD_INCLUDE_PATH . '\fficonfig.h');
+
+        // copy($this->source_dir . '\msvc_build\out\static-Release\X64\libffi.lib', BUILD_LIB_PATH . '\libffi.lib');
+        // copy($this->source_dir . '\msvc_build\include\ffi.h', BUILD_INCLUDE_PATH . '\ffi.h');
+        // copy($this->source_dir . '\msvc_build\include\fficonfig.h', BUILD_INCLUDE_PATH . '\fficonfig.h');
+        // copy($this->source_dir . '\src\x86\ffitarget.h', BUILD_INCLUDE_PATH . '\ffitarget.h');
+
+        // FileSystem::replaceFileStr(BUILD_INCLUDE_PATH . '\ffi.h', '..\..\src\x86\ffitarget.h', 'ffitarget.h');
+    }
+}

src/SPC/command/BuildCliCommand.php

@@ -37,8 +37,8 @@ class BuildCliCommand extends BuildCommand
         $this->addOption('with-suggested-exts', 'E', null, 'Build with suggested extensions for selected exts');
         $this->addOption('with-added-patch', 'P', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Inject patch script outside');
         $this->addOption('without-micro-ext-test', null, null, 'Disable phpmicro with extension test code');
-
         $this->addOption('with-upx-pack', null, null, 'Compress / pack binary using UPX tool (linux/windows only)');
+        $this->addOption('with-micro-logo', null, InputOption::VALUE_REQUIRED, 'Use custom .ico for micro.sfx (windows only)');
     }
 
     public function handle(): int
@@ -63,6 +63,14 @@ class BuildCliCommand extends BuildCommand
         if ($rule === BUILD_TARGET_ALL) {
             logger()->warning('--build-all option makes `--no-strip` always true, be aware!');
         }
+        if (($rule & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO && $this->getOption('with-micro-logo')) {
+            $logo = $this->getOption('with-micro-logo');
+            if (!file_exists($logo)) {
+                logger()->error('Logo file ' . $logo . ' not exist !');
+                return static::FAILURE;
+            }
+        }
+
         // Check upx
         $suffix = PHP_OS_FAMILY === 'Windows' ? '.exe' : '';
         if ($this->getOption('with-upx-pack')) {

src/globals/test-extensions.php

@@ -13,14 +13,13 @@ declare(strict_types=1);
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'event,gettext',
-    'Linux', 'Darwin' => 'event,gettext',
-    'Windows' => 'mbstring,pdo_sqlite,mbregex',
+    'Linux', 'Darwin' => 'imagick,zstd,bz2,zip,xml,dom',
+    'Windows' => 'mbstring,pdo_sqlite,mbregex,ffi',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
+    'Linux', 'Darwin' => 'xz',
     'Windows' => '',
 };
 
@@ -28,7 +27,7 @@ $with_libs = match (PHP_OS_FAMILY) {
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'common',
+    'Linux', 'Darwin' => 'minimal',
     'Windows' => 'none',
 };
 
@@ -63,6 +62,7 @@ $final_libs = trim($with_libs, $trim_value);
 
 if (PHP_OS_FAMILY === 'Windows') {
     $final_extensions_cmd = '"' . $final_extensions . '"';
+    $final_libs = $final_libs === '' ? '' : ('"' . $final_libs . '"');
 } else {
     $final_extensions_cmd = $final_extensions;
 }
@@ -70,7 +70,7 @@ if (PHP_OS_FAMILY === 'Windows') {
 echo match ($argv[1]) {
     'extensions' => $final_extensions,
     'libs' => $final_libs,
-    'libs_cmd' => ($final_libs === '' ? '' : (' --with-libs="' . $final_libs . '"')),
-    'cmd' => $final_extensions_cmd . ($final_libs === '' ? '' : (' --with-libs="' . $final_libs . '"')),
+    'libs_cmd' => ($final_libs === '' ? '' : (' --with-libs=' . $final_libs)),
+    'cmd' => $final_extensions_cmd . ($final_libs === '' ? '' : (' --with-libs=' . $final_libs)),
     default => '',
 };