Commit 3bbd4bc
committed
fix(pkgs): chriskohlhoff.asio name 回归 FQN 形式 + lint 守卫 (mcpp#278)
#109 把 pkgs/c/chriskohlhoff.asio.lua 的 name 从 "chriskohlhoff.asio"
改成 "asio"(namespace 不变),这是该 commit 对描述符的唯一功能性改动,
其余全是注释重写。结果三平台 workspace job 全部在 tests/examples/asio-module
上失败:
E_NOT_FOUND: package 'chriskohlhoff:chriskohlhoff.asio@1.38.1' not found
原因是 mcpp 内部两条规则对同一份描述符的口径不一致:身份归一化层
(manifest/xpkg.cppm canonical_xpkg_identity)认为 split 形式
(namespace="chriskohlhoff" + name="asio")与 FQN 形式等价、都合法,
而安装目标构造层(build/prepare.cppm)硬假设 name 字面值就等于
ns + "." + shortName。xlings/libxpkg 按前者的 name 字面值建索引 key
(entries[package.name] = "asio"),mcpp 却拿 "chriskohlhoff.asio" 去点名,
两者永远不相交。
实测四种消费端写法(点式选择器、ns 表内点式、default 索引裸名、别名索引
裸名)全部无解 —— ns 被身份闸门钉死、短名被 xpm 版本表钉死,fqname 恒为
chriskohlhoff.asio 而 key 恒为 asio。等价约束是 name 必须 ==
namespace + "." + <短名>,只能在描述符里修。
改动:
* pkgs/c/chriskohlhoff.asio.lua — name 写回 FQN 形式(与索引内其余 47 个
namespaced 包一致)。文件路径、namespace、消费端 mcpp.toml 均不动。
* pkgs/t/tensorvia-cpu.lua — 同类隐患(ns="aimol" + name="tensorvia-cpu"),
今天没被任何 workspace member 消费所以没暴露,但同样装不上;一并修正。
该文件是 `mcpp emit xpkg` 生成后手工补了 namespace 才落入 split 形式。
* tests/check_package_name.lua + validate.yml rule 5 — namespace 非空时
强制 name 以 "<namespace>." 开头。lint 秒级拦下,不再让这类错误跑满
三平台一小时后才炸。
验证(CI 钉住的 mcpp 0.0.102 + vendored xlings 0.4.67,冷 store 冷索引缓存):
tests/examples/asio-module → 5 passed; 0 failed。lint 全量重放 exit 0,
负向测试(把 name 改回 split 形式)如期报错。
上游已提 mcpp-community/mcpp#278:mcpp 要么构造 target 时用描述符声明的
name(loadVersionDep 里 luaContent 已在作用域内),要么收紧规范让
`mcpp xpkg parse` 直接拒绝 split 形式。本 lint 是上游对齐前索引侧的守卫。1 parent 788ce06 commit 3bbd4bc
4 files changed
Lines changed: 106 additions & 3 deletions
File tree
- .github/workflows
- pkgs
- c
- t
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
94 | 105 | | |
95 | 106 | | |
96 | 107 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
42 | 50 | | |
43 | 51 | | |
44 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
3 | 10 | | |
4 | 11 | | |
5 | | - | |
| 12 | + | |
6 | 13 | | |
7 | 14 | | |
8 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
0 commit comments