Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

### Added

- **mcpp.platforms 0.2.0。** 新增 GNU/Hurd(`x86_64-hurd`,Debian 基础库,版本与其运行的映像一致)与 Haiku(`x86_64-haiku`,hrev60431)两行,
均可 `import std`(GCC 15 的 std 模块),并在系统映像中经 dirun 运行;两行在 Linux 主机上构建,Hurd 亦可在 macOS 上构建;
Windows 主机不可(mcpp-community/mcpp#965),Haiku 在不区分大小写的文件系统上不可(mcpp-community/mcpp-platforms#5)。
- **mcpp.plugins 0.26.0。** `tools-steps` 的 glob 支持排除模式(`*` 可跨越 `/`);`dist-apk` 在 javac 和 kotlinc 编译前清空
class 目录,已移出包的源码不再把旧 class 带进下一次打包;`latest` 指向 0.26.0(mcpp-community/mcpp-plugins#60)。
- **openkal-platform 0.30.1。** 行 `i686-svr4-musl` 的链接声明程序头(`link/svr4.ld`):与此前相同的三个段,不写 `PT_PHDR`。
Expand Down
38 changes: 33 additions & 5 deletions pkgs/m/mcpp.platforms.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,25 @@
-- the rows it serves could not be built there from the index (measured in
-- mcpp's e2e 1116, mcpp-community/mcpp#951). The rows build on Linux, macOS and
-- Windows hosts with mcpp 2026.11.18.1 (mcpp-community/mcpp-platforms#4).
--
-- 0.2.0 (floor unchanged): GNU/Hurd (x86_64-hurd, Debian's base at the versions of
-- the image it runs in) and Haiku (x86_64-haiku, hrev60431), each compiling
-- `import std` over GCC 15's std module and run in the system's image through dirun
-- (mcpp-community/mcpp-platforms#5). Both build on Linux hosts, Hurd also on macOS;
-- not on Windows (mcpp-community/mcpp#965), and Haiku not on a case-insensitive
-- file system (its string.h and String.h).
package = {
spec = "1",
namespace = "mcpp",
name = "platforms",
description = "Rows for systems the engine does not carry (FreeBSD, NetBSD, OpenBSD): their definitions, bases and runners, as one versioned statement mcpp reads",
description = "Rows for systems the engine does not carry (FreeBSD, NetBSD, OpenBSD, GNU/Hurd, Haiku): their definitions, bases and runners, as one versioned statement mcpp reads",
licenses = {"Apache-2.0"},
repo = "https://github.com/mcpp-community/mcpp-platforms",
type = "package",

-- The rows this platform serves, for mcpp's platform column (SPEC-013 §14): derived
-- from the newest version's manifest by tools/platform_rows.py, never written by hand.
platform_rows = { "aarch64-freebsd", "aarch64-netbsd", "aarch64-openbsd", "x86_64-freebsd", "x86_64-netbsd", "x86_64-openbsd" },
platform_rows = { "aarch64-freebsd", "aarch64-netbsd", "aarch64-openbsd", "x86_64-freebsd", "x86_64-haiku", "x86_64-hurd", "x86_64-netbsd", "x86_64-openbsd" },
extensions = {
autoupdate = {
tag = "${version}",
Expand All @@ -40,34 +47,55 @@ package = {
-- One archive for every host: the package is a statement, not a program.
xpm = {
linux = {
["0.2.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.2.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.2.0/mcpp-platforms-0.2.0.tar.gz",
},
sha256 = "27ab1a3d4d18f0075cbd8888e8894737eb524cfefcd2d3c673a357ea283a66b6",
},
["0.1.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.1.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.1.0/mcpp-platforms-0.1.0.tar.gz",
},
sha256 = "bd09836f9952af28ede3f9c4568aafd999ace803f2cad21fed0aa4ca495893f3",
},
["latest"] = { ref = "0.1.0" },
["latest"] = { ref = "0.2.0" },
},
macosx = {
["0.2.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.2.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.2.0/mcpp-platforms-0.2.0.tar.gz",
},
sha256 = "27ab1a3d4d18f0075cbd8888e8894737eb524cfefcd2d3c673a357ea283a66b6",
},
["0.1.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.1.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.1.0/mcpp-platforms-0.1.0.tar.gz",
},
sha256 = "bd09836f9952af28ede3f9c4568aafd999ace803f2cad21fed0aa4ca495893f3",
},
["latest"] = { ref = "0.1.0" },
["latest"] = { ref = "0.2.0" },
},
windows = {
["0.2.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.2.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.2.0/mcpp-platforms-0.2.0.tar.gz",
},
sha256 = "27ab1a3d4d18f0075cbd8888e8894737eb524cfefcd2d3c673a357ea283a66b6",
},
["0.1.0"] = {
url = {
GLOBAL = "https://github.com/mcpp-community/mcpp-platforms/archive/refs/tags/0.1.0.tar.gz",
CN = "https://gitcode.com/mcpp-res/mcpp-platforms/releases/download/0.1.0/mcpp-platforms-0.1.0.tar.gz",
},
sha256 = "bd09836f9952af28ede3f9c4568aafd999ace803f2cad21fed0aa4ca495893f3",
},
["latest"] = { ref = "0.1.0" },
["latest"] = { ref = "0.2.0" },
},
},

Expand Down
8 changes: 4 additions & 4 deletions tests/examples/mcpp-platforms/mcpp.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# mcpp:platforms test project. The package serves the rows of FreeBSD, NetBSD
# and OpenBSD, which no member of this repository builds: the member names the
# mcpp:platforms test project. The package serves the rows of FreeBSD, NetBSD,
# OpenBSD, GNU/Hurd and Haiku, which no member of this repository builds: the member names the
# release for those rows, and the rows are built on Linux, macOS and Windows
# hosts (and run where an image exists) by the package's own CI
# (mcpp-community/mcpp-platforms) and by mcpp's e2e 1116. On a runner the
Expand All @@ -9,8 +9,8 @@
name = "mcpp-platforms-tests"
version = "0.1.0"

[target.'cfg(any(os = "freebsd", os = "netbsd", os = "openbsd"))']
platform = "mcpp.platforms@0.1.0"
[target.'cfg(any(os = "freebsd", os = "netbsd", os = "openbsd", os = "hurd", os = "haiku"))']
platform = "mcpp.platforms@0.2.0"

[indices]
mcpplibs = { path = "../../.." }
Loading