From f0e49f885e5b242403d66946590a919c61ae2c48 Mon Sep 17 00:00:00 2001 From: sunrisepeak Date: Mon, 11 May 2026 08:30:03 +0800 Subject: [PATCH 1/2] chore: migrate deps to namespace syntax (mcpp 0.0.6) Updates mcpp.toml to use explicit namespace fields: - [package].namespace added - [package].name uses short name only - [dependencies.compat] / [dev-dependencies.compat] for non-modular libs - [dependencies.mcpplibs.capi] for C API wrappers --- .github/workflows/ci.yml | 8 ++++---- .xlings.json | 2 +- mcpp.toml | 16 +++++----------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6616cbd..c004573 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,17 +23,17 @@ jobs: "/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install echo "$HOME/.xlings/subos/current/bin" >> "$GITHUB_PATH" - - name: Install workspace tools (.xlings.json → mcpp 0.0.4) + - name: Install workspace tools (.xlings.json → mcpp 0.0.6) run: xlings install -y # Cache mcpp's self-bootstrapped sandbox (musl-gcc + binutils + # glibc + ninja + patchelf, ~800 MB). Toolchain set is pinned by - # mcpp 0.0.4, so a fixed key suffices. + # mcpp 0.0.6, so a fixed key suffices. - name: Cache mcpp sandbox uses: actions/cache@v4 with: - path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.4/registry - key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.4 + path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.6/registry + key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.6 - name: Build with mcpp run: mcpp build diff --git a/.xlings.json b/.xlings.json index b3b1fb4..f07ea0d 100644 --- a/.xlings.json +++ b/.xlings.json @@ -1,5 +1,5 @@ { "workspace": { - "mcpp": { "linux": "0.0.4" } + "mcpp": { "linux": "0.0.6" } } } diff --git a/mcpp.toml b/mcpp.toml index ee95c54..4cbcac2 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -1,25 +1,19 @@ [package] -name = "mcpplibs.capi.lua" +namespace = "mcpplibs.capi" +name = "lua" version = "0.0.3" -description = "C++23 module wrapping the Lua 5.4 C API — `import mcpplibs.capi.lua;`" +description = "C++23 module wrapping the Lua 5.4 C API — import mcpplibs.capi.lua;" license = "Apache-2.0" repo = "https://github.com/mcpplibs/lua" [lib] -# The primary module interface lives at `src/capi/lua.cppm`. The default -# convention would look at `src/lua.cppm` (last segment of the package -# name), so override explicitly. path = "src/capi/lua.cppm" [targets.capi-lua] kind = "lib" -# `lua` is the upstream Lua 5.4 C library shipped via mcpp-index. mcpp -# 0.0.3 propagates its headers (lua.h / lauxlib.h / lualib.h) into our -# compile rule via the transitive include-dir walk. -[dependencies] +[dependencies.compat] lua = "5.4.7" -# `mcpp test` discovers tests/main.cpp automatically. -[dev-dependencies] +[dev-dependencies.compat] gtest = "1.15.2" From 82d9d9ec29e8ef26057baa7cd08235efd775f8aa Mon Sep 17 00:00:00 2001 From: sunrisepeak Date: Mon, 11 May 2026 08:48:27 +0800 Subject: [PATCH 2/2] ci: retrigger with fixed mcpp 0.0.6 --- .github/workflows/ci.yml | 8 ++++---- .xlings.json | 2 +- mcpp.toml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c004573..d27b500 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,17 +23,17 @@ jobs: "/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install echo "$HOME/.xlings/subos/current/bin" >> "$GITHUB_PATH" - - name: Install workspace tools (.xlings.json → mcpp 0.0.6) + - name: Install workspace tools (.xlings.json → mcpp 0.0.7) run: xlings install -y # Cache mcpp's self-bootstrapped sandbox (musl-gcc + binutils + # glibc + ninja + patchelf, ~800 MB). Toolchain set is pinned by - # mcpp 0.0.6, so a fixed key suffices. + # mcpp 0.0.7, so a fixed key suffices. - name: Cache mcpp sandbox uses: actions/cache@v4 with: - path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.6/registry - key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.6 + path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.7/registry + key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.7 - name: Build with mcpp run: mcpp build diff --git a/.xlings.json b/.xlings.json index f07ea0d..3f993c1 100644 --- a/.xlings.json +++ b/.xlings.json @@ -1,5 +1,5 @@ { "workspace": { - "mcpp": { "linux": "0.0.6" } + "mcpp": { "linux": "0.0.7" } } } diff --git a/mcpp.toml b/mcpp.toml index 4cbcac2..738275d 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -2,7 +2,7 @@ namespace = "mcpplibs.capi" name = "lua" version = "0.0.3" -description = "C++23 module wrapping the Lua 5.4 C API — import mcpplibs.capi.lua;" +description = "C++23 module wrapping the Lua 5.4 C API" license = "Apache-2.0" repo = "https://github.com/mcpplibs/lua" @@ -12,8 +12,8 @@ path = "src/capi/lua.cppm" [targets.capi-lua] kind = "lib" -[dependencies.compat] +[dependencies] lua = "5.4.7" -[dev-dependencies.compat] +[dev-dependencies] gtest = "1.15.2"