Skip to content

Commit bcea4db

Browse files
committed
openkal-kit 0.3.1 in place of 0.3.0; the kit member uses port 8080 and is a workspace member
kit 0.3.0 wrote at most three digits of a port (8080 as 080); 0.3.1 writes them all. The openkal-kit member formats 8080, so it exercises the fix, and the workspace root names it among its members.
1 parent 02e1625 commit bcea4db

5 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525

2626
### Added
2727

28-
- **openkal 0.25 一族,一次变更:openkal 0.25.0、openkal-kit 0.3.0、openkal-linux 0.26.0、openkal-macos 0.23.0、
28+
- **openkal 0.25 一族,一次变更:openkal 0.25.0、openkal-kit 0.3.1、openkal-linux 0.26.0、openkal-macos 0.23.0、
2929
openkal-windows 0.21.0、openkal-emscripten 0.14.0、openkal-opensbi 0.9.0。** 规范新增 `kal_fs_hard_link`(按卷由
3030
`KAL_FS_PROP_HARD_LINKS` 回答,条款 11 第 59 条),`kal_process_stop_requested` 的字改为计数每次结束请求(第 60 条);一致性
3131
套件按 mtest 测试协议报告,并核对实现清单的 `provides-interfaces`、`kal_interfaces()` 与导出名。各实现提供上述两项,测试改为
3232
mtest 的用例;openkal-emscripten 声明 `requires = ["mcpp:c-abi"]`。`tests/examples/openkal` 改用此族,新增成员
33-
`tests/examples/openkal-kit` 作为 kit 的直接使用者。
33+
`tests/examples/openkal-kit` 作为 kit 的直接使用者。kit 0.3.1 修正 `format_v4` 只写端口前三位数字的错误(8080 写作 080)。
3434
- **mcpplibs.os 0.4.3.** 依赖改为同时容纳 openkal 0.24 与 0.25 两族的版本区间(openkal `>=0.24.0, <0.26.0`,各实现同理),
3535
mcpp 版本下限不变;openkal 实现以 mtest 测试自身时,经 mtest 到达 os 的图得以解析(mcpplibs/os#23)。
3636
- **openkal-platform 0.24.5、openkal-image 0.5.4(openkal-ld、openkal-run、openkal-tools、openkal-bind)、mcpplibs.os 0.4.2,

‎mcpp.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ members = [
260260
"tests/examples/rapidcsv",
261261
"tests/examples/mcr",
262262
"tests/examples/openkal",
263+
"tests/examples/openkal-kit",
263264
"tests/examples/openkal-musl",
264265
"tests/examples/openkal-platform",
265266
"tests/examples/compiler-rt-builtins",

‎pkgs/o/openkal-kit.lua‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ package = {
4141

4242
xpm = {
4343
linux = {
44-
["0.3.0"] = {
44+
["0.3.1"] = {
4545
url = {
46-
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.0.tar.gz",
47-
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.0/openkal-kit-0.3.0.tar.gz",
46+
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.1.tar.gz",
47+
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.1/openkal-kit-0.3.1.tar.gz",
4848
},
49-
sha256 = "c7365e916662679cd99e91c547eb42c3c4fc2eacbdc842668a14d30d09db99e4",
49+
sha256 = "81cea3b8a749089a39bfbed4dfa7a90603383152120a8b88c81fd4d206880a8d",
5050
},
5151
["0.2.0"] = {
5252
url = {
@@ -64,12 +64,12 @@ package = {
6464
},
6565
},
6666
macosx = {
67-
["0.3.0"] = {
67+
["0.3.1"] = {
6868
url = {
69-
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.0.tar.gz",
70-
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.0/openkal-kit-0.3.0.tar.gz",
69+
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.1.tar.gz",
70+
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.1/openkal-kit-0.3.1.tar.gz",
7171
},
72-
sha256 = "c7365e916662679cd99e91c547eb42c3c4fc2eacbdc842668a14d30d09db99e4",
72+
sha256 = "81cea3b8a749089a39bfbed4dfa7a90603383152120a8b88c81fd4d206880a8d",
7373
},
7474
["0.2.0"] = {
7575
url = {
@@ -87,12 +87,12 @@ package = {
8787
},
8888
},
8989
windows = {
90-
["0.3.0"] = {
90+
["0.3.1"] = {
9191
url = {
92-
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.0.tar.gz",
93-
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.0/openkal-kit-0.3.0.tar.gz",
92+
GLOBAL = "https://github.com/mcpplibs/openkal/archive/refs/tags/kit-0.3.1.tar.gz",
93+
CN = "https://gitcode.com/mcpp-res/openkal/releases/download/kit-0.3.1/openkal-kit-0.3.1.tar.gz",
9494
},
95-
sha256 = "c7365e916662679cd99e91c547eb42c3c4fc2eacbdc842668a14d30d09db99e4",
95+
sha256 = "81cea3b8a749089a39bfbed4dfa7a90603383152120a8b88c81fd4d206880a8d",
9696
},
9797
["0.2.0"] = {
9898
url = {

‎tests/examples/openkal-kit/mcpp.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = "0.1.0"
99

1010
[dependencies.mcpplibs]
1111
openkal = "0.25.0"
12-
openkal-kit = "0.3.0"
12+
openkal-kit = "0.3.1"
1313

1414
[target.'cfg(os = "linux")'.dependencies.mcpplibs]
1515
openkal-linux = "0.26.0"

‎tests/examples/openkal-kit/tests/kit.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ int main() {
1111
auto check = [&](bool held, const char* what) {
1212
if (!held) { std::printf("FAIL: %s\n", what); ++failures; }
1313
};
14-
const auto r = parse_v4("127.0.0.1:443", 13);
15-
check(r.ok && r.ep.addr_len == 4 && r.ep.port == 443, "an address with a port parses");
14+
const auto r = parse_v4("127.0.0.1:8080", 14);
15+
check(r.ok && r.ep.addr_len == 4 && r.ep.port == 8080, "an address with a port parses");
1616
char out[32];
1717
const auto f = format_v4(r.ep, out, sizeof out);
18-
check(f.ok && f.n == 13 && std::memcmp(out, "127.0.0.1:443", 13) == 0,
18+
check(f.ok && f.n == 14 && std::memcmp(out, "127.0.0.1:8080", 14) == 0,
1919
"and is written back as it was given");
2020
check(!parse_v4("256.0.0.1", 9).ok, "an octet past 255 is refused");
2121
check(!parse_v4("1.2.3", 5).ok, "three octets are refused");

0 commit comments

Comments
 (0)