Skip to content

Commit 392733b

Browse files
authored
feat(v3): Tool package refactor (crazywhalecc#1200)
2 parents 3870269 + dc33b55 commit 392733b

43 files changed

Lines changed: 566 additions & 182 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README-zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ echo '<?php echo "Hello world!\n";' > a.php
104104

105105
## 直接下载
106106

107-
如果你暂时不想构建,或只想先测试,可以从 [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物,或从自托管服务器下载。
107+
如果你暂时不想构建,或只想先测试,可以从 [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物,或从自托管服务器下载。
108108

109109
我们为每个 PHP 版本提供 2 种扩展集合:
110110

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ see <https://static-php.dev>.
104104

105105
## Direct Download
106106

107-
If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
107+
If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
108108

109109
We offer 2 types of extension sets for each PHP version:
110110

‎config/pkg/lib/openssl.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ openssl:
1717
- zlib
1818
depends@windows:
1919
- zlib
20-
- jom
2120
headers:
2221
- openssl
2322
static-libs@unix:
@@ -26,3 +25,6 @@ openssl:
2625
static-libs@windows:
2726
- libssl.lib
2827
- libcrypto.lib
28+
tools@windows:
29+
- jom
30+
- strawberry-perl

‎config/pkg/target/frankenphp.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ frankenphp:
1010
license: MIT
1111
depends:
1212
- php-embed
13-
- go-xcaddy
1413
depends@windows:
1514
- php-embed
16-
- go-win
1715
- pthreads4w
1816
suggests@unix:
1917
- brotli
@@ -24,3 +22,7 @@ frankenphp:
2422
- frankenphp
2523
static-bins@windows:
2624
- frankenphp.exe
25+
tools:
26+
- go-xcaddy
27+
tools@windows:
28+
- go-win

‎config/pkg/target/pkg-config.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎config/pkg/target/zig.yml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
7za-win:
2-
type: target
2+
type: tool
33
artifact:
44
binary:
55
windows-x86_64: { type: url, url: 'https://dl.static-php.dev/v3/tools/7zip/7za.exe', extract: '{pkg_root_path}/bin/7za.exe' }
6+
tool:
7+
provides:
8+
- 7za.exe
9+
binary-subdir: bin
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
go-win:
2-
type: target
2+
type: tool
33
artifact:
44
binary: custom
55
env:
@@ -8,3 +8,8 @@ go-win:
88
GOPATH: '{pkg_root_path}/go-win/go'
99
path@windows:
1010
- '{pkg_root_path}/go-win/bin'
11+
tool:
12+
provides:
13+
- go.exe
14+
- gofmt.exe
15+
binary-subdir: go-win/bin
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
go-xcaddy:
2-
type: target
2+
type: tool
33
artifact:
44
binary: custom
55
env:
@@ -8,5 +8,8 @@ go-xcaddy:
88
GOPATH: '{pkg_root_path}/go-xcaddy/go'
99
path@unix:
1010
- '{pkg_root_path}/go-xcaddy/bin'
11-
static-bins:
12-
- xcaddy
11+
tool:
12+
provides:
13+
- go
14+
- gofmt
15+
binary-subdir: go-xcaddy/bin
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
jom:
2-
type: target
2+
type: tool
33
artifact:
44
binary:
55
windows-x86_64: { type: url, url: 'https://download.qt.io/official_releases/jom/jom.zip', extract: '{pkg_root_path}/jom' }
66
path@windows:
77
- '{pkg_root_path}\jom'
8+
tool:
9+
provides:
10+
- jom.exe
11+
binary-subdir: jom

0 commit comments

Comments
 (0)