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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 退出码契约 + 宿主脚本冒烟)。
# 依赖:luiox-repo git 直连包(libca/libmcp/libjstr/libjbytecode/libjzip/
# libgarena/libjclassfile),由 CI 显式注册(root xmake.lua 不声明
# add_repositories 到 luiox-repo 以外的远端);gtest/libarchive/zlib 走 xrepo。
# add_repositories 到 luiox-repo 以外的远端);gtest/zlib 走 xrepo。
# mjbase:源码级依赖(公开仓 luiox/mjbase,定版 checkout 到 mjbase-src,
# 经 --mjbase_root 指入;升级 mjbase 时同步更新下方 ref)。

Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: luiox/mjbase
ref: 72cc5d72f79da48a6f33107103c528e9cc2d8269
ref: 9b34b34cc9cba50b2a9e810d1b1387badc8a9d9b
path: mjbase-src

- name: Install system deps
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: luiox/mjbase
ref: 72cc5d72f79da48a6f33107103c528e9cc2d8269
ref: 9b34b34cc9cba50b2a9e810d1b1387badc8a9d9b
path: mjbase-src

- name: Setup xmake
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: luiox/mjbase
ref: 72cc5d72f79da48a6f33107103c528e9cc2d8269
ref: 9b34b34cc9cba50b2a9e810d1b1387badc8a9d9b
path: mjbase-src

- name: Setup Python 3.14 (python314.dll / include / libs for mjt-py)
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ xmake run <target> --gtest_brief=1

外部依赖只有 luiox-repo 中心包仓直连包(libca / libmcp / libjstr /
libjzip / libgarena / libjclassfile / libjstd / libjdk_finder /
libjhasm + xrepo 的 gtest / libarchive / zlib / nlohmann_json;
libjhasm + xrepo 的 gtest / zlib / nlohmann_json;
libjbc 走项目内联包定义,git 直连 + commit 锁),不引入仓内副本、不做 phony
垫片;各包嵌套的 libca 必须用 `add_requireconfs` 钉回同一 `LUIOX_LIBCA_VERSION`。
libjbytecode / libjblw 已全退役(B7 摘 libjblw,B8 8.7 摘 libjbytecode)。
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ xmake build mjt-mcp
Dependencies are pulled directly from
[luiox-repo](https://github.com/luiox/luiox-repo): libca, libmcp, libjstr,
libjzip, libgarena, libjclassfile, libjstd, libjdk_finder,
libjhasm; libarchive / zlib / nlohmann_json come from
libjhasm; zlib / nlohmann_json come from
[xrepo](https://xmake.io). libjbc is defined as an in-repo inline package
(git direct with a pinned commit, kept at the same version as mjbase). The
bytecode foundation itself is mjbase, consumed as a source-level sibling
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ xmake build mjt-mcp

依赖经 [luiox-repo](https://github.com/luiox/luiox-repo) 直连拉取:libca、libmcp、
libjstr、libjzip、libgarena、libjclassfile、libjstd、
libjdk_finder、libjhasm;libarchive / zlib / nlohmann_json 走
libjdk_finder、libjhasm;zlib / nlohmann_json 走
[xrepo](https://xmake.io)。libjbc 走项目内联包定义(git 直连 + commit 锁,与
mjbase 同版本)。字节码基座本体是 mjbase,打包进 luiox-repo 前以兄弟目录源码级
依赖消费(`--mjbase_root`,默认 `../mjbase`)。
Expand Down
2 changes: 1 addition & 1 deletion docs/rfc/0001-analysis-project-resource-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mjt 当前的分析载体是 **进程内 workspace**:MCP 会话里 `workspace_

### 2.3 已落地的容器层:`mjbase::model`

`mjbase/mjbase/src/mjbase/model/`(module-map 批 2,libarchive 后端保留,`module-map.md:33`):`IResource`(URI + 类型化载荷:Class/Manifest/Jar/Unknown,`resource_model.hpp:39-47,111-122`)+ `IResourceContainer`(unordered_map + Utf8StringArena,重复条目 first-wins 对齐 JVM 类加载并记录 `duplicateResourceUris`,issue #962,`resource_container.hpp:9-11,32-110`)。
`mjbase/mjbase/src/mjbase/model/`(module-map 批 2,`module-map.md:33`):`IResource`(URI + 类型化载荷:Class/Manifest/Jar/Unknown,`resource_model.hpp:39-47,111-122`)+ `IResourceContainer`(unordered_map + Utf8StringArena,重复条目 first-wins 对齐 JVM 类加载并记录 `duplicateResourceUris`,issue #962,`resource_container.hpp:9-11,32-110`)。

### 2.4 公私边界与批次现状

Expand Down
6 changes: 1 addition & 5 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@ if has_config("with_tests") then
add_requires("gtest")
end

-- libarchive:mjbase model 资源导入导出的跨平台解包后端(tar/xz/gz/zst)。
-- 本地覆盖包(xmake/repo/packages/l/libarchive/xmake.lua)规避官方包在
-- Linux 漏传 POSIX_REGEX_LIB=NONE 导致的编译失败。
add_repositories("mjt-repo xmake/repo")
add_requires("libarchive 3.8.8", {configs = {openssl3 = false}})
-- zlib:libjzip 传递需要;nlohmann_json:MCP 协议载荷。
add_requires("zlib")
add_requires("nlohmann_json 3.12.0")

Expand Down
83 changes: 0 additions & 83 deletions xmake/repo/packages/l/libarchive/xmake.lua

This file was deleted.

Loading