V3 feat/re2c

composer.json

@@ -13,6 +13,7 @@
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "laravel/prompts": "~0.1",
+        "nette/php-generator": "^4.2",
         "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",

config/pkg.lib.json

@@ -711,6 +711,9 @@
     "ncurses": {
         "type": "library",
         "artifact": "ncurses",
+        "static-libs@unix": [
+            "libncurses.a"
+        ],
         "license": {
             "type": "file",
             "path": "COPYING"

src/Package/Command/SwitchPhpVersionCommand.php

@@ -9,7 +9,7 @@
 use StaticPHP\Artifact\DownloaderOptions;
 use StaticPHP\Command\BaseCommand;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Package\PackageLoader;
+use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;

src/Package/Extension/readline.php

@@ -4,17 +4,20 @@
 
 namespace Package\Extension;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\AfterStage;
 use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\Extension;
+use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 use StaticPHP\Util\SourcePatcher;
 
 #[Extension('readline')]
 class readline
 {
-    #[BeforeStage('php', 'unix-make-cli')]
+    #[BeforeStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
+    #[PatchDescription('Fix readline static build with musl')]
     public function beforeMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
     {
         if ($toolchain->isStatic()) {
@@ -23,7 +26,7 @@ public function beforeMakeLinuxCli(PackageInstaller $installer, ToolchainInterfa
         }
     }
 
-    #[AfterStage('php', 'unix-make-cli')]
+    #[AfterStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
     public function afterMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
     {
         if ($toolchain->isStatic()) {

src/Package/Library/imap.php

@@ -4,6 +4,7 @@
 
 namespace Package\Library;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\AfterStage;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Attribute\PatchDescription;
@@ -13,7 +14,7 @@
 #[Library('imap')]
 class imap
 {
-    #[AfterStage('php', 'patch-embed-scripts')]
+    #[AfterStage('php', [php::class, 'patchEmbedScripts'], 'imap')]
     #[PatchDescription('Fix missing -lcrypt in php-config libs on glibc systems')]
     public function afterPatchScripts(): void
     {

src/Package/Library/libedit.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Library;
+
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\BuildFor;
+use StaticPHP\Attribute\Package\Library;
+use StaticPHP\Package\LibraryPackage;
+use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
+use StaticPHP\Util\FileSystem;
+
+#[Library('libedit')]
+class libedit extends LibraryPackage
+{
+    #[BeforeStage(stage: 'build')]
+    public function patchBeforeBuild(): void
+    {
+        FileSystem::replaceFileRegex(
+            "{$this->getSourceDir()}/src/sys.h",
+            '|//#define\s+strl|',
+            '#define strl'
+        );
+    }
+
+    #[BuildFor('Darwin')]
+    #[BuildFor('Linux')]
+    public function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv(['CFLAGS' => '-D__STDC_ISO_10646__=201103L'])
+            ->configure()
+            ->make();
+        $this->patchPkgconfPrefix(['libedit.pc']);
+    }
+}

src/Package/Library/ncurses.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Library;
+
+use StaticPHP\Attribute\Package\BuildFor;
+use StaticPHP\Attribute\Package\Library;
+use StaticPHP\Package\LibraryPackage;
+use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Util\DirDiff;
+use StaticPHP\Util\FileSystem;
+
+#[Library('ncurses')]
+class ncurses
+{
+    #[BuildFor('Darwin')]
+    #[BuildFor('Linux')]
+    public function build(LibraryPackage $package, ToolchainInterface $toolchain): void
+    {
+        $dirdiff = new DirDiff(BUILD_BIN_PATH);
+
+        UnixAutoconfExecutor::create($package)
+            ->appendEnv([
+                'LDFLAGS' => $toolchain->isStatic() ? '-static' : '',
+            ])
+            ->configure(
+                '--enable-overwrite',
+                '--with-curses-h',
+                '--enable-pc-files',
+                '--enable-echo',
+                '--disable-widec',
+                '--with-normal',
+                '--with-ticlib',
+                '--without-tests',
+                '--without-dlsym',
+                '--without-debug',
+                '--enable-symlinks',
+                "--bindir={$package->getBinDir()}",
+                "--includedir={$package->getIncludeDir()}",
+                "--libdir={$package->getLibDir()}",
+                "--prefix={$package->getBuildRootPath()}",
+            )
+            ->make();
+        $new_files = $dirdiff->getIncrementFiles(true);
+        foreach ($new_files as $file) {
+            @unlink(BUILD_BIN_PATH . '/' . $file);
+        }
+
+        shell()->cd(BUILD_ROOT_PATH)->exec('rm -rf share/terminfo');
+        shell()->cd(BUILD_ROOT_PATH)->exec('rm -rf lib/terminfo');
+
+        $pkgconf_list = ['form.pc', 'menu.pc', 'ncurses++.pc', 'ncurses.pc', 'panel.pc', 'tic.pc'];
+        $package->patchPkgconfPrefix($pkgconf_list);
+
+        foreach ($pkgconf_list as $pkgconf) {
+            FileSystem::replaceFileStr("{$package->getLibDir()}/pkgconfig/{$pkgconf}", "-L{$package->getLibDir()}", '-L${libdir}');
+        }
+    }
+}

src/Package/Library/postgresql.php

@@ -4,6 +4,7 @@
 
 namespace Package\Library;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Attribute\PatchDescription;
@@ -12,7 +13,7 @@
 #[Library('postgresql')]
 class postgresql
 {
-    #[BeforeStage('php', 'unix-configure', 'postgresql')]
+    #[BeforeStage('php', [php::class, 'configureForUnix'], 'postgresql')]
     #[PatchDescription('Patch to avoid explicit_bzero detection issues on some systems')]
     public function patchBeforePHPConfigure(TargetPackage $package): void
     {

src/Package/Target/micro.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Target;
+
+use StaticPHP\Attribute\Package\BeforeStage;
+use StaticPHP\Attribute\Package\Target;
+use StaticPHP\Attribute\PatchDescription;
+use StaticPHP\Package\TargetPackage;
+use StaticPHP\Util\FileSystem;
+
+#[Target('php-micro')]
+class micro
+{
+    #[BeforeStage('php', [php::class, 'makeEmbedForUnix'], 'php-micro')]
+    #[PatchDescription('Patch Makefile to build only libphp.la for embedding')]
+    public function patchBeforeEmbed(TargetPackage $package): void
+    {
+        FileSystem::replaceFileStr("{$package->getSourceDir()}/Makefile", 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+    }
+}