mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-10 10:25:36 +08:00
refactor: move getLibExtra* to Package base, add ToolPackage support to executors and builders
- Move getLibExtraCFlags/getLibExtraCxxFlags/getLibExtraLdFlags/getLibExtraLibs from LibraryPackage to Package base class so ToolPackage can also use them - Full ToolPackage implementation: getBuildRootPath, getIncludeDir, getLibDir, getBinDir, getToolField with platform suffix support - Update PackageBuilder to support building ToolPackage (not just LibraryPackage) - Update PackageInstaller: support ToolPackage in download/extract/install pipeline, auto-install build-time tools, record installed versions - Allow LibraryPackage|ToolPackage union type in all Executor classes and UnixShell::initializeEnv
This commit is contained in:
@@ -5,12 +5,13 @@ declare(strict_types=1);
|
||||
namespace StaticPHP\Runtime\Executor;
|
||||
|
||||
use StaticPHP\Package\LibraryPackage;
|
||||
use StaticPHP\Package\ToolPackage;
|
||||
|
||||
abstract class Executor
|
||||
{
|
||||
public function __construct(protected LibraryPackage $package) {}
|
||||
public function __construct(protected LibraryPackage|ToolPackage $package) {}
|
||||
|
||||
public static function create(LibraryPackage $package): static
|
||||
public static function create(LibraryPackage|ToolPackage $package): static
|
||||
{
|
||||
return new static($package);
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ use StaticPHP\Exception\SPCInternalException;
|
||||
use StaticPHP\Package\LibraryPackage;
|
||||
use StaticPHP\Package\PackageBuilder;
|
||||
use StaticPHP\Package\PackageInstaller;
|
||||
use StaticPHP\Package\ToolPackage;
|
||||
use StaticPHP\Runtime\Shell\UnixShell;
|
||||
use StaticPHP\Util\InteractiveTerm;
|
||||
use ZM\Logger\ConsoleColor;
|
||||
@@ -22,7 +23,7 @@ class UnixAutoconfExecutor extends Executor
|
||||
|
||||
protected PackageInstaller $installer;
|
||||
|
||||
public function __construct(protected LibraryPackage $package, ?PackageInstaller $installer = null)
|
||||
public function __construct(protected LibraryPackage|ToolPackage $package, ?PackageInstaller $installer = null)
|
||||
{
|
||||
parent::__construct($package);
|
||||
if ($installer !== null) {
|
||||
|
||||
@@ -11,6 +11,7 @@ use StaticPHP\Package\LibraryPackage;
|
||||
use StaticPHP\Package\PackageBuilder;
|
||||
use StaticPHP\Package\PackageInstaller;
|
||||
use StaticPHP\Package\TargetPackage;
|
||||
use StaticPHP\Package\ToolPackage;
|
||||
use StaticPHP\Runtime\Shell\UnixShell;
|
||||
use StaticPHP\Runtime\SystemTarget;
|
||||
use StaticPHP\Util\FileSystem;
|
||||
@@ -40,7 +41,7 @@ class UnixCMakeExecutor extends Executor
|
||||
|
||||
protected PackageInstaller $installer;
|
||||
|
||||
public function __construct(protected LibraryPackage $package, ?PackageInstaller $installer = null)
|
||||
public function __construct(protected LibraryPackage|ToolPackage $package, ?PackageInstaller $installer = null)
|
||||
{
|
||||
parent::__construct($package);
|
||||
if ($installer !== null) {
|
||||
|
||||
@@ -9,6 +9,7 @@ use StaticPHP\Exception\SPCInternalException;
|
||||
use StaticPHP\Package\LibraryPackage;
|
||||
use StaticPHP\Package\PackageBuilder;
|
||||
use StaticPHP\Package\PackageInstaller;
|
||||
use StaticPHP\Package\ToolPackage;
|
||||
use StaticPHP\Runtime\Shell\WindowsCmd;
|
||||
use StaticPHP\Util\FileSystem;
|
||||
use StaticPHP\Util\InteractiveTerm;
|
||||
@@ -35,7 +36,7 @@ class WindowsCMakeExecutor extends Executor
|
||||
|
||||
protected PackageInstaller $installer;
|
||||
|
||||
public function __construct(protected LibraryPackage $package)
|
||||
public function __construct(protected LibraryPackage|ToolPackage $package)
|
||||
{
|
||||
parent::__construct($this->package);
|
||||
$this->builder = ApplicationContext::get(PackageBuilder::class);
|
||||
|
||||
@@ -6,6 +6,7 @@ namespace StaticPHP\Runtime\Shell;
|
||||
|
||||
use StaticPHP\Exception\SPCInternalException;
|
||||
use StaticPHP\Package\LibraryPackage;
|
||||
use StaticPHP\Package\ToolPackage;
|
||||
use StaticPHP\Runtime\SystemTarget;
|
||||
use ZM\Logger\ConsoleColor;
|
||||
|
||||
@@ -40,9 +41,9 @@ class UnixShell extends Shell
|
||||
/**
|
||||
* Init the environment variable that common build will be used.
|
||||
*
|
||||
* @param LibraryPackage $library Library package
|
||||
* @param LibraryPackage|ToolPackage $library Library or tool package
|
||||
*/
|
||||
public function initializeEnv(LibraryPackage $library): UnixShell
|
||||
public function initializeEnv(LibraryPackage|ToolPackage $library): UnixShell
|
||||
{
|
||||
$this->setEnv([
|
||||
'CFLAGS' => $library->getLibExtraCFlags(),
|
||||
|
||||
Reference in New Issue
Block a user