diff --git a/.agents/skills/add-mcpp-index-package/SKILL.md b/.agents/skills/add-mcpp-index-package/SKILL.md index fc9da695..d50024ca 100644 --- a/.agents/skills/add-mcpp-index-package/SKILL.md +++ b/.agents/skills/add-mcpp-index-package/SKILL.md @@ -66,14 +66,14 @@ description: Use when adding a new third-party library/package to the mcpp-index 6. **编写测试工程(workspace 成员)**:mwrap 使用 `tests/mwrap//`,传统包使用 `tests/examples//`(`short` 为包名去除 `compat.`/`mcpplibs.` 前缀后的结果;公开模块包用 `-module`),并把它加进仓根 `mcpp.toml` 的 `[workspace].members`。 - 包含 `mcpp.toml` 与 `tests/*.cpp`,后者须包含**可失败的有效断言**(`return ok ? 0 : 1`)。 - - 普通成员用一条 `[indices] = { path = "../../.." }` 将所消费命名空间重定向到 checkout。 - 不把同一个完整索引路径注册成多个 namespace:当前 xlings 会将同一实体报为歧义。 - mwrap workspace 成员保留显式空 `[indices]` 表,由 `tests/run_members.sh` 将完整且字节不变的 + - 普通成员用一条 `[indices] = { path = "../../.." }` 将所消费命名空间重定向到 checkout(消费 compat 的成员写 + `compat`);仓根不写 `[indices]`。不把同一个完整索引路径注册成多个 namespace:mcpp 以 `index-location-named-twice` 拒绝。 + mwrap workspace 成员不写 `[indices]`,由 `tests/run_members.sh` 将完整且字节不变的 checkout 索引放入测试 home 的唯一内置索引。未设置 MCPP_HOME 时使用 target/mwrap-test-home。 namespace 视图仅供隔离的单项目消费者;不能以独立项目通过证明混合 workspace 顺序可用。 正常发布布局另由 `tests/mwrap/check_installed_template.py` 在独立 MCPP_HOME 中使用单一完整索引验收。 运行库/插件/host-module 多 namespace 耦合时,优先用 `tests/prepare_builtin_index.py --home <独立测试 home>` - 安装唯一完整内置索引,成员以空 `[indices]` 覆盖旧 workspace 路由。自动更新候选 CI 同样采用此方式, + 安装唯一完整内置索引,成员不写 `[indices]`。自动更新候选 CI 同样采用此方式, 避免项目别名缓存相互污染;这是测试准备,不是发布 staging 或目录转换。 - 非全平台包按 `[target.'cfg(...)'.dependencies]` 门控依赖,测试源码在被门控掉的平台上 编译为 no-op `main`(`#ifdef __linux__ … #else int main(){return 0;} #endif` 模式)。 diff --git a/.github/workflows/openkal-compat.yml b/.github/workflows/openkal-compat.yml index 37b44803..71214e44 100644 --- a/.github/workflows/openkal-compat.yml +++ b/.github/workflows/openkal-compat.yml @@ -42,7 +42,7 @@ env: # run if this drifts from pins.toml. See the comment beside `mcpp` in # pins.toml for why this pin, not just validate.yml's, is gated by the # index floor. - MCPP_VERSION: "2026.11.18.1" + MCPP_VERSION: "2026.11.22.1" # CROSS-VALIDATION BEFORE A RELEASE, NOT AFTER IT. # # Empty in an ordinary run, so this measurement keeps using the RELEASED diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 9b2dccdc..d1ef2ce7 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -466,7 +466,19 @@ env: # 2026.11.18.1: the newest release; its default platform is # openkal-platform 0.29.2, and a row's object format and file names are # read from data (the row, its system, the format's convention). - MCPP_VERSION: "2026.11.18.1" + # + # 2026.11.21.1: the newest release; its default platform is + # openkal-platform 0.31.2, a first run installs gcc 16.2.0, ninja + # 1.13.2-mcpp.1 and patchelf 0.19.3, it bundles xlings 2026.11.21.1, and a + # cached dependency is served only against the module interfaces it was + # compiled with. + # + # 2026.11.22.1: the newest release; its default platform is + # openkal-platform 0.31.2 and it bundles xlings 2026.11.21.1. An installed + # toolchain's companions are the first declaration its store holds, and two + # [indices] entries naming one location are refused, which is why the + # workspace states no index and each member states its own. + MCPP_VERSION: "2026.11.22.1" jobs: lint: @@ -1686,7 +1698,7 @@ jobs: - name: Installed llama.cpp-m archive and actual CPU project template if: contains(format(' {0} ', env.MEMBERS), ' llamacpp-cpu ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.llamacpp@b10069 --legacy-exact-key + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.llamacpp@b10069.2 --legacy-exact-key - name: Installed FFmpeg wrapper archive and actual default project template if: contains(format(' {0} ', env.MEMBERS), ' ffmpeg-cpu ') && matrix.toolchain == 'default' @@ -1696,47 +1708,47 @@ jobs: - name: Installed ImGui wrapper archive and actual headless default template if: contains(format(' {0} ', env.MEMBERS), ' imgui-headless ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.imgui@1.92.8 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.imgui@1.92.8.1 - name: Installed md4c wrapper archive and actual default render template if: contains(format(' {0} ', env.MEMBERS), ' md4c-render ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.md4c@0.5.3 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.md4c@0.5.3.1 - name: Installed accesskit wrapper archive and actual default tree template if: contains(format(' {0} ', env.MEMBERS), ' accesskit-tree ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.accesskit@0.23.1 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.accesskit@0.23.1.1 - name: Installed Lua wrapper archive and actual default script template if: contains(format(' {0} ', env.MEMBERS), ' lua-embed ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.lua@5.4.7 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.lua@5.4.7.1 - name: Installed QuickJS-ng wrapper archive and actual default script template if: contains(format(' {0} ', env.MEMBERS), ' quickjs-embed ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.quickjs_ng@0.17.0 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.quickjs_ng@0.17.0.1 - name: Installed libpng wrapper archive and actual default image template if: contains(format(' {0} ', env.MEMBERS), ' libpng-image ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libpng@1.6.43 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libpng@1.6.43.1 - name: Installed concurrentqueue wrapper archive and actual default pipeline template if: contains(format(' {0} ', env.MEMBERS), ' concurrentqueue-mpmc ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.concurrentqueue@1.0.5 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.concurrentqueue@1.0.5.1 - name: Installed FriBidi wrapper archive, actual default bidi template and its relocated LGPL notices if: contains(format(' {0} ', env.MEMBERS), ' fribidi-bidi ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.fribidi@1.0.16 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.fribidi@1.0.16.1 --deploy - name: Installed SheenBidi wrapper archive, actual default bidi template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' sheenbidi-bidi ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.sheenbidi@3.0.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.sheenbidi@3.0.0.1 --deploy - name: Installed Slint wrapper archive, actual default hello template (headless) and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' slint-ui ') && matrix.toolchain == 'default' @@ -1753,42 +1765,42 @@ jobs: - name: Installed dr_libs wrapper archive, actual default tone template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' dr_libs-audio ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.dr_libs@2026.03.03 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.dr_libs@2026.03.03.1 --deploy - name: Installed Opus wrapper archive, actual default tone template and its relocated BSD notices if: contains(format(' {0} ', env.MEMBERS), ' opus-ogg ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.opus@1.6.1 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.opus@1.6.1.1 --deploy - name: Installed Box2D wrapper archive, actual default physics template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' box2d-physics ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.box2d@3.2.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.box2d@3.2.0.1 --deploy - name: Installed mimalloc wrapper archive, actual default allocation template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' mimalloc-heap ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.mimalloc@3.6.1 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.mimalloc@3.6.1.1 --deploy - name: Installed zlib wrapper archive, actual default compression template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' zlib-compress ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.zlib@1.3.2 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.zlib@1.3.2.1 --deploy - name: Installed zstd wrapper archive, actual default compression template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' zstd-squeeze ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.zstd@1.5.7 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.zstd@1.5.7.1 --deploy - name: Installed xz wrapper archive, actual default compression template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' xz-pack ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.xz@5.8.3 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.xz@5.8.3.2 --deploy - name: Installed xxhash wrapper archive, actual default hashing template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' xxhash-digest ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.xxhash@0.8.3 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.xxhash@0.8.3.1 --deploy - name: Installed meshoptimizer wrapper archive, actual default simplification template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' meshoptimizer-simplify ') && matrix.toolchain == 'default' @@ -1858,52 +1870,52 @@ jobs: - name: Installed libarchive wrapper archive, actual default archive template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' libarchive-bundle ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libarchive@3.8.7 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libarchive@3.8.7.1 --deploy - name: Installed libc wrapper archive, actual default C stdio template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' libc-stdio ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libc@17.0.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libc@17.0.0.1 --deploy - name: Installed libwebp wrapper archive, actual default image template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' libwebp-image ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libwebp@1.5.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libwebp@1.5.0.1 --deploy - name: Installed libvpx wrapper archive, actual default webm template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' libvpx-webm ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libvpx@1.17.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.libvpx@1.17.0.1 --deploy - name: Installed PocketPy wrapper archive, actual default script template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' pocketpy-embed ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.pocketpy@2.2.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.pocketpy@2.2.0.1 --deploy - name: Installed miniaudio wrapper archive, actual default tone template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' miniaudio-engine ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.miniaudio@0.11.25 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.miniaudio@0.11.25.1 --deploy - name: Installed FreeType wrapper archive, actual default banner template and its relocated FTL notices if: contains(format(' {0} ', env.MEMBERS), ' freetype-render ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.freetype@2.13.3 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.freetype@2.13.3.1 --deploy - name: Installed HarfBuzz wrapper archive, actual default shape template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' harfbuzz-shape ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.harfbuzz@14.3.0 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.harfbuzz@14.3.0.1 --deploy - name: Installed SDL3 wrapper archive, actual default info template and its relocated notices if: contains(format(' {0} ', env.MEMBERS), ' sdl3-headless ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.sdl3@3.4.18 --deploy + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.sdl3@3.4.18.1 --deploy - name: Installed Godot wrapper archive and actual standalone math template if: contains(format(' {0} ', env.MEMBERS), ' godot-math ') && matrix.toolchain == 'default' shell: bash - run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.godot_cpp@10.0.0 + run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.godot_cpp@10.0.0.1 - name: Report temporarily untestable consumers of the unavailable MySQL source shell: bash diff --git a/.github/workflows/xpkgindex-update.yml b/.github/workflows/xpkgindex-update.yml index 4d04af3d..2d0e1736 100644 --- a/.github/workflows/xpkgindex-update.yml +++ b/.github/workflows/xpkgindex-update.yml @@ -25,7 +25,7 @@ concurrency: env: PYTHONUTF8: '1' - MCPP_VERSION: '2026.11.18.1' + MCPP_VERSION: '2026.11.22.1' # CROSS-VALIDATION BEFORE A RELEASE: a candidate that needs an mcpp newer # than the pin (its package states the floor) is built with mcpp built from # this branch of mcpp-community/mcpp, as openkal-compat.yml measures with it. diff --git a/CHANGELOG.md b/CHANGELOG.md index d25891a7..b9079860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -194,6 +194,19 @@ ### Changed +- **工作区不再陈述索引,每个成员陈述自己测试所经的索引。** 根 `mcpp.toml` 的 `[indices] compat = { path = "." }` 由位置读取 + (2026.10.10.1 弃用,2027.1 移除);149 个成员改为各自写 `compat = { path = "<到检出的相对路径>" }`,与已以其他名字指向检出的 + 79 个成员同形;57 个 mwrap 成员与 5 个 mtest 示例为避开根的重定向而写的空 `[indices]` 删去。改用 `[workspace.indices]` 不可行: + 它按名字合并,79 个成员会得到同一检出的两个名字,安装以 ambiguous 失败(mcpp 2026.11.22.1 起以 `index-location-named-twice` + 拒绝)。29 个成员清单的依赖选择器去掉引号(父包与子包并存者除外)。`tests/test_prepare_mwrap_indices.py`、docs/mwrap.md、 + docs/repository-and-schema.md 随之改写。 +- **28 个封装包发布模板修订,模板写不加引号的选择器。** fribidi 1.0.16.1、imgui 1.92.8.1、libarchive 3.8.7.1、libpng 1.6.43.1、 + lua 5.4.7.1、miniaudio 0.11.25.1、pocketpy 2.2.0.1、quickjs_ng 0.17.0.1、sdl3 3.4.18.1、xxhash 0.8.3.1、xz 5.8.3.2、zlib 1.3.2.1、 + zstd 1.5.7.1、accesskit 0.23.1.1、box2d 3.2.0.1、concurrentqueue 1.0.5.1、dr_libs 2026.03.03.1、freetype 2.13.3.1、godot_cpp + 10.0.0.1、harfbuzz 14.3.0.1、libc 17.0.0.1、libvpx 1.17.0.1、libwebp 1.5.0.1、llamacpp b10069.2、md4c 0.5.3.1、mimalloc 3.6.1.1、 + opus 1.6.1.1、sheenbidi 3.0.0.1(各包最新标签的 `templates/**/mcpp.toml.in` 测得写 `"{{self.name}}"`)。原有 CN 镜像的包在 + `mcpp-res/mwrap-<名>` 发布同一字节。llama.cpp-m 的 `mwrap-b10069.1` 打了标签而未发布(其发布门禁所在的 runner 映像换了 clang, + API 快照的读法不同),`b10069.2` 带同一改动。 - **compat.onnxruntime 以 `license_files` 陈述 SDK 的许可文件**(`LICENSE` 与 `ThirdPartyNotices.txt`)。mcpp 2026.11.17.1 在每种打包模式中 把它们放在 `share/licenses/compat.onnxruntime/`;此前由 `deploy` 放在程序旁的 `licenses/onnxruntime/`。包装的 LICENSE 与 NOTICE 仍由 mcpplibs.mwrap.onnxruntime 自己的 `deploy` 放在 `licenses/onnxruntime/wrapper/`。 @@ -203,6 +216,25 @@ ### Fixed +- **compat.curand 在 LLVM 构建的程序上可加载。** `libcurand.so.10` 需要 `libgcc_s.so.1`;以 LLVM 构建的产物链接 compiler-rt 与 + libunwind,不加载它,mcpp 的运行时闭包检查拒绝该程序(`libgcc_s.so.1 not found on the search path`,linux llvm 行的 + cuda-curand 成员)。compat.curand 依赖 `xim:gcc-runtime`,并把其中的 `libgcc_s.so.1` 与 glibc 的兼容桩一同链接进库目录, + 与 compat.sycl-runtime 同形。 +- **compat.libarchive 去掉 Linux uapi 功能的条件改为 `cfg(all(linux, kernel-abi = "openkal"))`。** 此前的条件 + `c-abi = "musl"` 本为 openkal 的图,也命中原生 musl 工具链(`musl-gcc`),而后者自带内核头文件;功能缺席的是内核接口这一层, + 不是 C 库。macOS 上的 `-U__APPLE__` 同样改按 `kernel-abi` 选择。 +- **Windows 上静态库为每个包含其头文件的单元陈述静态 API 宏(archive 与 libarchive-bundle 启动即崩溃的根因)。** `lzma.h` 与 + `archive.h` 在未定义 `LZMA_API_STATIC`、`LIBARCHIVE_STATIC` 时声明 dllimport;使用方经 lld-link 为本地定义造的 `__imp_` 槽调用, + 回收无引用节的链接(mcpp 2026.11.9.1 起测试的链接)丢弃槽后的函数,首次调用跳到映像首字节(退出 133)。MSVC 的 link.exe 保留 + 这些函数,lld-link 不保留(mcpp-community/mcpp#1002)。compat.xz、compat.libarchive、compat.fribidi(此前宏只在 Windows 的私有 + cflags)与 compat.libcoro(此前为私有 `defines`)改为由 `default` 蕴含的 `staticlib` feature,与 compat.curl、compat.c-ares 同形; + compat.cpptrace、compat.libassert、compat.yaml-cpp 原以 `#include_next` 垫片传递宏,改为同一 feature,垫片删去(垫片不能用于 + cl.exe)。docs/repository-and-schema.md 原称 feature 的 `defines` 只作用于包自身,与 mcpp 不符,已改正。windows-2022 上以修正复测, + 两个成员通过。 +- **compat.sdl2 与 taskflow.taskflow 在 clang 23 的 MSVC ABI 下编译(修订 1)。** clang 23 把 `_m_prefetch` 作为内建函数,SDL 2.32.10 + 的 `SDL_endian.h` 在该 ABI 下定义它,compat.sdl2 在 install() 中移植上游 SDL2 分支以 `!_SDL_HAS_BUILTIN(_m_prefetch)` 保护的一行; + taskflow 4.1.0 的 `tfprof.hpp` 以 `static inline` 定义两个命名空间作用域的函数,两个模块分区的全局模块片段各包含一次而修饰名相同, + taskflow.taskflow 在 install() 中改为 `inline`。 - **compat.c-ares:`CARES_STATICLIB` 传给使用方(Windows 上 gRPC 启动即崩溃的根因)。** 此前只有包自身以该宏编译,使用方看到的 `` 把每个入口声明为 `__declspec(dllimport)`,经 lld-link 本地补全的 `__imp_` 槽调用静态库(LNK4217)。lld-link 在不带 `/DEBUG` 时默认 `/OPT:REF`,该槽不保住它的定义:定义所在目标文件只因随后被丢弃的代码而载入时,定义被丢弃、槽内为映像基址。gRPC 的 `ares_library_init` 正是如此,`grpc_init` 跳到 PE 头(0xC0000005,mcpp 报 exit 133);四行 C 即可复现(llvm 23.1.3)。上游的 Bazel(`defines`)与 CMake(INTERFACE 定义)都把该宏传给依赖方;此处按 compat.curl 的写法以 `default` 隐含的 feature `defines` 传递。在装有旧 compat.c-ares 的 home 上实测生效,无需 packaging revision;gRPC 的模块测试在 Windows 默认链接参数下通过(grpc-m#10)。 - **mcpp.plugins 0.23.1。** `dist-apk` 把构建程序在输出目录(`mcpp::out_dir()`、`target/`)中生成的 Java 或 Kotlin 根只作为 `javac` 动作的输入,不再为其声明永远无法命中的重跑 glob,消除每次构建的警告。`latest` 指向 0.23.1 @@ -261,16 +293,21 @@ ### Chore - **已安装模板的检查可选镜像。** `tests/mwrap/check_installed_template.py` 新增 `--mirror {GLOBAL,CN}`(默认 GLOBAL);此前固定为 GLOBAL,发布时的 CN 验收只能手工执行。`--published-index --mirror CN` 下 xxhash-m 0.8.3 的封装归档首次即从 gitcode.com 取得。 -- **已安装模板的检查:模板写引号键时只允许该弃用警告。** mcpp 2026.11.8.1 之前发布的 mwrap 模板以 `"{{self.name}}"` 写依赖键, - 渲染为一个带引号的键;`--strict` 拒绝这一弃用读法,归档又不可改。检查在渲染出引号键时不加 `--strict` 构建,只允许该包的这条 - 弃用警告,其余警告仍失败;模板的下一版写不带引号的选择器后自动恢复严格构建(onnxruntime-m 1.25.1;opencv-m、ffmpeg-m 的模板同形)。 - 该检查同时按新的位置核对 SDK 的许可文件,并为本次运行请求项目根的编译数据库(`MCPP_COMPILE_COMMANDS`;mcpp 2026.10.26.1 起只在 +- **已安装模板的检查拒绝写引号键的模板,并以 `--strict` 构建。** 引号键自 mcpp 2026.11.8.1 弃用、2027.2 移除;写它的 28 个封装包 + 各发布一个修订(见 Changed),检查以这些修订为对象,不再为引号键放行弃用警告。该检查同时按新的位置核对 SDK 的许可文件,并为本次运行请求项目根的编译数据库(`MCPP_COMPILE_COMMANDS`;mcpp 2026.10.26.1 起只在 请求时写出),模板生成的清单保持原样;`mcpp pack` 改用 `--pkg-format`。 - **mcpp.platforms 0.1.0 的条目列出每种宿主。** 条目此前只列 Linux,macOS 与 Windows 宿主无法安装该包 (`has no build for windows`),它服务的行在这两种宿主上无法经索引构建(mcpp e2e 1116 测得)。包是一份陈述, 各宿主使用同一个归档。 测试成员 `tests/examples/mcpp-platforms` 为这些行指名此版本;行由包自己的 CI 在三种宿主上构建。 +- **CI 的 mcpp 由 2026.11.18.1 改为 2026.11.22.1**(validate、xpkgindex-update、openkal-compat 与 `tests/openkal/pins.toml`): + 该版的默认平台为 openkal-platform 0.31.2,首次运行安装 gcc 16.2.0、ninja `1.13.2-mcpp.1` 与 patchelf 0.19.3,随带 + xlings 2026.11.21.1;缓存的依赖只在其编译时所用的模块接口下取用;已安装工具链的配套载荷取 store 持有的第一个声明; + `[indices]` 中两项指向同一位置时拒绝(`index-location-named-twice`)。索引的客户端下界(`min_mcpp`)不变。该版命令行的 `@` 按写出的前缀选择 + (`--template ...@1.3` 渲染 1.3 下最新的 1.3.1),`tests/mwrap/check_installed_template.py` 据此检查模板写入的版本落在 + 所请求的前缀之下,并读取所选版本的安装。 + - **CI 的 mcpp 由 2026.11.17.2 改为 2026.11.18.1**(validate、xpkgindex-update 与 openkal-compat):该版的默认平台为 openkal-platform 0.29.2,行的对象格式与文件名读自数据(行、系统、格式的约定),mcpp.platforms 的 FreeBSD 行在 Windows 宿主上以行的名字构建。 diff --git a/docs/mwrap.md b/docs/mwrap.md index e3446f73..e7d98378 100644 --- a/docs/mwrap.md +++ b/docs/mwrap.md @@ -165,13 +165,13 @@ Templates are data, without execution hooks. With the pinned current mcpp, ```toml [dependencies] -"{{self.name}}" = { version = "{{self.version}}", features = ["imgproc", "imgcodecs-png"] } +{{self.name}} = { version = "{{self.version}}", features = ["imgproc", "imgcodecs-png"] } ``` -Quote the selector as one key; do not place it under another namespace table. -From mcpp 2026.11.8.1 a quoted key that needs no quotes is reported (and `--strict` refuses it); a template -tested with that client writes the same selector as a dotted key, `{{self.name}} = "{{self.version}}"`, which -names the same package. `tests/mwrap/check_installed_template.py` reads either form. +Write the selector unquoted, as a dotted key; do not place it under another namespace table. +A quoted key that needs no quotes is deprecated from mcpp 2026.11.8.1 (`--strict` refuses it) and +is removed in 2027.2. `tests/mwrap/check_installed_template.py` refuses a template that writes it, +and builds the rendered project with `--strict`. Declare required features explicitly and keep the library version tied to `{{self.version}}`. Test actual `mcpp new`, then build and run the generated project. A source candidate may use an isolated preseeded installed-package @@ -227,13 +227,13 @@ CI check before reporting merge/release readiness. ## Candidate index tests across namespaces -The pinned client can report duplicate candidates when a workspace mixes full project indices and namespace views. Mwrap workspace members retain an explicit empty `[indices]` table. `tests/run_members.sh` prepares one complete unchanged built-in candidate index before their tests; an unset MCPP_HOME uses the task-owned target/mwrap-test-home. CI prepares that candidate after refreshing the published registry. Keep the legacy workspace redirect semantics; `[workspace.indices]` merges entries and is not a mechanical spelling replacement. +The pinned client can report duplicate candidates when a workspace mixes full project indices and namespace views. Mwrap workspace members state no `[indices]`, and the workspace root states none for them: each other member states the index it tests through (`compat = { path = "" }` for this checkout), since mcpp removes the positional reading of a root's `[indices]` in 2027.1 and `[workspace.indices]` merges with a member's entries. `tests/run_members.sh` prepares one complete unchanged built-in candidate index before their tests; an unset MCPP_HOME uses the task-owned target/mwrap-test-home. CI prepares that candidate after refreshing the published registry. Namespace views created by tests/prepare_mwrap_indices.py remain available for isolated single-project consumers. Their descriptors preserve source bytes and SHA256 provenance. A standalone success does not certify a mixed workspace sequence. Views are ignored outputs, not a publication format. Normal installed consumers are tested independently by tests/mwrap/check_installed_template.py: it copies the complete pkgs/index.toml publication layout into one isolated built-in index, downloads the real checksummed source archive, runs mcpp new and builds/runs the generated manifest without a path substitution. Its home downloads from the GLOBAL mirror unless `--mirror CN` names the other (the CN acceptance of a release). The Git and published pkgs/mwrap directory layout remains identical. -Coupled runtime/plugin/build-module consumers may require several candidate namespaces at once. Use `python3 tests/prepare_builtin_index.py --home ` to install the complete unchanged candidate layout as the test home's single built-in index; the member uses an empty `[indices]` table to override legacy workspace redirects. Updater candidate CI uses this mode too. Do not register the same full checkout through multiple project aliases. This is test-home preparation only: no publication staging, path conversion or mcpp engine change is required. +Coupled runtime/plugin/build-module consumers may require several candidate namespaces at once. Use `python3 tests/prepare_builtin_index.py --home ` to install the complete unchanged candidate layout as the test home's single built-in index; the member states no `[indices]`. Updater candidate CI uses this mode too. Do not register the same full checkout through multiple project aliases. This is test-home preparation only: no publication staging, path conversion or mcpp engine change is required. For Linux consumers loading a C++ SDK through a C API, verify the C++ runtime contract as well as successful calls. The OpenCV/ORT integration exposed uncaught typed exceptions when a static runtime was embedded alongside the shared SDK runtime; `cxx_runtime = "toolchain-coupled"` fixed the same test. Templates must encode the verified contract and exercise a typed error path. diff --git a/docs/repository-and-schema.md b/docs/repository-and-schema.md index e6c47e53..f51bf96b 100644 --- a/docs/repository-and-schema.md +++ b/docs/repository-and-schema.md @@ -8,14 +8,12 @@ Module wrapper descriptors use `pkgs/mwrap/.lua` and their consumers use `t ``` pkgs//.lua descriptors. is the initial of the full package name (compat.* → c, nlohmann.json → n, imgui → i) -mcpp.toml workspace manifest (the members list) + the root-level [indices] compat = { path = "." }, - inherited by members (relative paths resolve against the workspace root, mcpp >= 0.0.97) +mcpp.toml workspace manifest (the members list); it states no [indices] tests/examples// one test project per library (a workspace member; is the package name minus its - mcpp.toml prefix, or -module for module packages). Members consuming compat write no - [indices]; members consuming another namespace write exactly one (module packages use - default), and that declaration **replaces** the root-level table rather than merging with - it — at most one project-level index repo per member is a hard constraint, see - "Index redirection" below. Dependencies gate themselves per platform + mcpp.toml prefix, or -module for module packages). Members consuming compat write + [indices] compat = { path = "" }; members consuming another namespace write + that one instead (module packages use default) — one project-level index repo per member, + see "Index redirection" below. Dependencies gate themselves per platform ([target.'cfg(...)']) tests/*.cpp behavioral assertions (standalone main; a non-zero exit code is a failure) tests/check_mirror_urls.lua lint: GLOBAL+CN table completeness, and that CN points at mcpp-res @@ -114,7 +112,7 @@ renews every entry that lists its rows; a new platform's entry is named. The lin | `sources` | glob list; the sources compiled into the lib | | `cflags` / `cxxflags` / `ldflags` | appended to the corresponding rule | | `targets` | `{ ["name"]={ kind="lib"/"bin", main=…, soname=… } }` | -| `features` | `{ ["f"]={ sources={…}, defines={…}, deps={…}, implies={…}, requires={…} } }`; `defines` applies only to the **package's own** TUs, so a consumer that wants to branch on a feature must declare it itself (see the `[target.'cfg(…)'.build] cxxflags` in `tests/examples/openssl` and `openblas`) | +| `features` | `{ ["f"]={ sources={…}, defines={…}, deps={…}, implies={…}, requires={…} } }`; an active feature's `defines` reach the package's own TUs and every TU that receives its include directories (an interface contribution); a define every consumer needs, such as a static library's `CURL_STATICLIB` or `LZMA_API_STATIC`, is a `staticlib` feature that `default` implies (`compat.curl`, `compat.c-ares`, `compat.xz`) | | `deps` | `{ ["ns.name"]="ver" }`, flat or dotted; the same shape inside a feature | ## Index redirection (`[indices]`) @@ -122,12 +120,13 @@ renews every entry that lists its rows; a new platform's entry is named. The lin What the test surface has to validate is **the descriptors in the checkout**, not the published remote index, and `[indices]` is what redirects a namespace into this repository to make that happen. -**Root-level inheritance**: the workspace root's `mcpp.toml` declares `[indices] compat = { path = "." }`, whose -relative path resolves against the **workspace root** (mcpp >= 0.0.97, -[mcpp#224](https://github.com/mcpp-community/mcpp/issues/224)), and members inherit it directly instead of each -writing their own `path = "../../.."`. +**One per member**: a member that tests a namespace of this checkout states it, `[indices] = { path = "" }`, its relative path anchored at the member. The root states none. A root's `[indices]` reached members by +position, a reading mcpp deprecated in 2026.10.10.1 and removes in 2027.1, and `[workspace.indices]` merges with a +member's entries by name: a member naming the checkout under another namespace would hold it twice, which mcpp +refuses (`index-location-named-twice`), and an mwrap member would hold it beside its candidate index. -**Why there is only one, and why it is `compat`**: +**Why one namespace per member**: - The index table is **keyed by namespace**. Declared under a name no dependency ever requests, the index is simply never registered, and resolution silently falls back to the published remote index — at which point what is under @@ -138,15 +137,8 @@ writing their own `path = "../../.."`. [xlings#374](https://github.com/openxlings/xlings/issues/374) — a silent exit 1 before xlings 0.4.69, a loud error since). -So the root level can carry exactly one namespace, and `compat` is the one that buys the most (13 members against 10 -for everything else combined). - -**Member-level override**: a member consuming another namespace declares its own `[indices]`, and that table -**replaces** the inherited root-level one rather than merging with it — which is precisely the mechanism that keeps -one project index repo per member. - **The cross-namespace trade-off**: a single member cannot resolve two namespaces from this checkout. `tests/examples/asio-ssl` -exploits that deliberately: it writes no member-level declaration and inherits the root `compat`, so asio itself comes +exploits that deliberately: it states `compat` alone, so asio itself comes from the published remote index while its `ssl` feature dependency `compat.openssl` resolves from this checkout — which means **an unmerged compat descriptor can be validated through an already-published consumer**. The local asio descriptor is covered the other way round, by `tests/examples/asio-module`. @@ -208,7 +200,7 @@ locally with `mcpp xpkg parse pkgs//.lua`. - `workspace ( /)`: the whole test surface is one mcpp workspace and the **only build/run channel** — there is no shell-driven exception (the public module packages imgui/ffmpeg/opencv/tinyhttps are ordinary members too, resolving from the checkout through a member-level `[indices] default = { path = "../../.." }`, - mcpp >= 0.0.97; members consuming `compat` inherit the root-level declaration, see "Index redirection" above). The + mcpp >= 0.0.97; members consuming `compat` state `[indices] compat = { path = "../../.." }`, see "Index redirection" above). The shard suffix appears only where the platform is actually split. - Members run through `tests/run_members.sh`, the same script used locally. A timing table that exists only in CI cannot be consulted while deciding what to optimise, and a local harness that differs from CI measures something diff --git a/docs/zh/mwrap.md b/docs/zh/mwrap.md index 401dcc4e..428164e3 100644 --- a/docs/zh/mwrap.md +++ b/docs/zh/mwrap.md @@ -108,13 +108,13 @@ mcpp new --list-templates mcpplibs.mwrap.opencv@5.0.0 mcpp new viewer --template mcpplibs.mwrap.opencv@5.0.0:window ``` -模板是纯数据,不执行 hook。当前 mcpp 的 self.name 为完整包选择器,应作为一个带引号的 key(mcpp 2026.11.8.1 起,不需要引号的 -key 带引号会被提示,`--strict` 下被拒绝;以该版本测试的模板把同一选择器写成点分 key `{{self.name}} = "{{self.version}}"`, -指向同一个包,`tests/mwrap/check_installed_template.py` 两种写法都读): +模板是纯数据,不执行 hook。当前 mcpp 的 self.name 为完整包选择器,写成不加引号的点分 key(不需要引号的 key 带引号自 +mcpp 2026.11.8.1 起弃用,`--strict` 下被拒绝,2027.2 移除;`tests/mwrap/check_installed_template.py` 拒绝写成引号键的模板, +并以 `--strict` 构建渲染出的工程): ```toml [dependencies] -"{{self.name}}" = { version = "{{self.version}}", features = ["imgproc", "imgcodecs-png"] } +{{self.name}} = { version = "{{self.version}}", features = ["imgproc", "imgcodecs-png"] } ``` 不能再把 self.name 放入另一层 namespace 表。版本与 self.version 绑定,明确所需 feature。 diff --git a/docs/zh/repository-and-schema.md b/docs/zh/repository-and-schema.md index c9b64ce4..d8df1065 100644 --- a/docs/zh/repository-and-schema.md +++ b/docs/zh/repository-and-schema.md @@ -8,13 +8,12 @@ ``` pkgs//.lua 描述符。 取完整包名首字母(compat.* → c,nlohmann.json → n,imgui → i) -mcpp.toml workspace 清单(members 列表)+ 根级 [indices] compat = { path = "." }, - 由成员继承(相对路径按 workspace 根解析,mcpp ≥ 0.0.97) +mcpp.toml workspace 清单(members 列表);不写 [indices] tests/examples// 每库测试工程(workspace 成员; 为包名去前缀,模块包为 - mcpp.toml -module)。消费 compat 的成员不写 [indices];消费其他 - 命名空间的成员写恰好一条(模块包用 default),该声明**替换** - 根级表而非合并 —— 每个成员最多一个项目级索引 repo 是硬约束, - 详见下文「索引重定向」。依赖按平台自门控 + mcpp.toml -module)。消费 compat 的成员写 [indices] compat = + { path = "<到仓根>" };消费其他命名空间的成员改写那一个(模块包用 + default)—— 每个成员一个项目级索引 repo,详见下文「索引重定向」。 + 依赖按平台自门控 ([target.'cfg(...)']) tests/*.cpp 行为断言(独立 main,退出码非 0 即失败) tests/check_mirror_urls.lua lint:GLOBAL+CN 表完整性,以及 CN 指向 mcpp-res @@ -95,25 +94,23 @@ namespace = "mcpplibs", name = "capi.lua" -- 短名仍带点 | `sources` | glob 列表,编入 lib 的源码 | | `cflags` / `cxxflags` / `ldflags` | 追加至对应规则 | | `targets` | `{ ["name"]={ kind="lib"/"bin", main=…, soname=… } }` | -| `features` | `{ ["f"]={ sources={…}, defines={…}, deps={…}, implies={…}, requires={…} } }`;`defines` 只作用于**包自身**的 TU,消费端若要按 feature 分支须自行声明(见 `tests/examples/openssl`、`openblas` 的 `[target.'cfg(…)'.build] cxxflags`) | +| `features` | `{ ["f"]={ sources={…}, defines={…}, deps={…}, implies={…}, requires={…} } }`;生效 feature 的 `defines` 作用于包自身的 TU,以及接收其包含目录的每个 TU(接口贡献);每个消费者都需要的宏,如静态库的 `CURL_STATICLIB`、`LZMA_API_STATIC`,写成由 `default` 蕴含的 `staticlib` feature(`compat.curl`、`compat.c-ares`、`compat.xz`) | | `deps` | `{ ["ns.name"]="ver" }`,扁平或点号式;feature 内同形 | ## 索引重定向(`[indices]`) 测试面要验证的是 **checkout 里的描述符**,而不是已发布的远程索引,这靠 `[indices]` 把命名空间重定向到本仓完成。 -**根级继承**:workspace 根的 `mcpp.toml` 声明 `[indices] compat = { path = "." }`,相对路径按 **workspace 根**解析(mcpp ≥ 0.0.97,[mcpp#224](https://github.com/mcpp-community/mcpp/issues/224)),成员直接继承,不必各写一份 `path = "../../.."`。 +**每个成员一条**:测试本 checkout 某个命名空间的成员自己写明它,`[indices] = { path = "<到仓根>" }`,相对路径以成员为锚。仓根不写。仓根的 `[indices]` 按位置到达成员,mcpp 自 2026.10.10.1 弃用、自 2027.1 移除这一读法;`[workspace.indices]` 则按名字与成员的项合并:以另一个命名空间指向 checkout 的成员会两次持有它,mcpp 以 `index-location-named-twice` 拒绝,mwrap 成员也会在候选索引之外再持有它。 -**为什么只有一条,而且是 `compat`**: +**为什么每个成员一个命名空间**: - 索引表**按命名空间取键**。声明在一个没有任何依赖会请求的名字下,该索引根本不会被注册,解析会静默回落到已发布的远程索引 —— 此时被测的根本不是这个 checkout。 - 同一路径声明成多个命名空间确实都会注册,但会变成 N 个各自独立的项目 repo,之后任何查找都以 N 路歧义失败(物理上是同一个描述符;[mcpp#238](https://github.com/mcpp-community/mcpp/issues/238) / [xlings#374](https://github.com/openxlings/xlings/issues/374),在 xlings 0.4.69 后由静默 exit 1 变为响亮报错)。 -所以根级只能承载一个命名空间,`compat` 是收益最大的那个(13 个成员 vs 其余合计 10 个)。 -**成员级覆盖**:消费其他命名空间的成员自己声明 `[indices]`,该表**替换**继承来的根级表而非与之合并 —— 这正是每个成员只保留一个项目索引 repo 的机制。 -**跨命名空间的取舍**:一个成员无法同时从本 checkout 解析两个命名空间。`tests/examples/asio-ssl` 有意利用了这一点:它不写成员级声明、继承根级 `compat`,于是 asio 本身走已发布的远程索引,而它的 `ssl` feature 依赖 `compat.openssl` 从本 checkout 解析 —— 这样**未合并的 compat 描述符可以通过一个已发布的消费者去验证**。反过来,本地 asio 描述符由 `tests/examples/asio-module` 覆盖。 +**跨命名空间的取舍**:一个成员无法同时从本 checkout 解析两个命名空间。`tests/examples/asio-ssl` 有意利用了这一点:它只写 `compat`,于是 asio 本身走已发布的远程索引,而它的 `ssl` feature 依赖 `compat.openssl` 从本 checkout 解析 —— 这样**未合并的 compat 描述符可以通过一个已发布的消费者去验证**。反过来,本地 asio 描述符由 `tests/examples/asio-module` 覆盖。 **裸名依赖不适用**:重定向按**请求侧**的命名空间取键,而裸写的 `eigen = "5.0.1"` 是以默认命名空间发出的请求,即使最终落到 `compat` 描述符上,也会从远程索引解析。因此各成员一律使用限定写法;裸名解析本身由 mcpp 上游的 e2e 165 覆盖。 @@ -162,7 +159,7 @@ mcpp 跑 `xpkg parse`(strict:未知键即失败),所以需要更新文法/键的 - `workspace (<平台> <分片>/<总数>)`:整个测试面就是一个 mcpp workspace,**唯一的构建/运行通道**—— 没有任何 shell 驱动的例外(公开模块包 imgui/ffmpeg/opencv/tinyhttps 也是普通成员,经成员级 `[indices] default = { path = "../../.." }` 从 checkout 解析,mcpp ≥ 0.0.97;消费 `compat` 的 - 成员则继承根级声明,见上文「索引重定向」)。分片后缀仅在该平台确实被拆分时出现。 + 成员写 `[indices] compat = { path = "../../.." }`,见上文「索引重定向」)。分片后缀仅在该平台确实被拆分时出现。 - 成员经 `tests/run_members.sh` 运行,该脚本亦即本地入口。只存在于 CI 的耗时表无法在决定优化对象时被 参考,而与 CI 不同的本地测量装置度量的是另一回事。 - 包构建缓存取全局,即 mcpp 的默认值。该步骤此前设 `MCPP_BUILD_CACHE: local` 以规避 mcpp#344 —— 同一 diff --git a/mcpp.toml b/mcpp.toml index 25e2d500..df0dfac6 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -297,30 +297,19 @@ members = [ "tests/examples/os", ] -# ── The index redirect, hoisted to the workspace root ─────────────────── -# Members inherit this, and the relative `path` resolves against the -# WORKSPACE ROOT rather than the member directory (mcpp#224, fixed in -# 0.0.97) — so the 13 members that consume `compat` no longer each repeat -# `path = "../../.."`, and member depth stops mattering. +# ── The index each member tests through ───────────────────────────────── +# Every member states its own `[indices]`: `compat = { path = "" }` for the members that resolve compat.* from this checkout, another +# namespace's name for the members that test one, none for the mwrap members, +# which take the complete candidate index tests/prepare_builtin_index.py puts +# in their test home. The root states none. Its `[indices]` reached members by +# position, a reading mcpp removes in 2027.1, and `[workspace.indices]` merges +# with a member's entries by name: a member naming this checkout as +# `mcpplibs` would hold it twice, which mcpp refuses +# (`index-location-named-twice`; before, every lookup was ambiguous), and an +# mwrap member would hold the checkout beside the candidate index. # -# Why exactly ONE entry, and why `compat` specifically: -# -# * The key is looked up by NAMESPACE. An index declared under a name that -# is not a namespace any dependency asks for is never registered, and -# resolution silently falls through to the published remote index — the -# checkout under test is then not what is being tested at all. -# * Declaring the same path under several namespaces does register them, -# as N separate project repos, and every lookup afterwards fails with an -# N-way ambiguity between what is physically one descriptor -# (mcpp#238 / xlings#374 — now a loud error rather than a silent exit 1). -# -# So the root can carry exactly one namespace, and `compat` is the one that -# pays: 13 members against 10 for everything else combined. A member that -# needs a different namespace declares its own `[indices]`, which REPLACES -# this table rather than merging with it — which is precisely what keeps it -# at one repo per member. -# -# A member inheriting this still resolves OTHER namespaces from the +# A member that states `compat` still resolves OTHER namespaces from the # published remote index. tests/examples/asio-ssl leans on that deliberately: # asio itself comes from the published index while its `ssl` feature dep, # compat.openssl, resolves from this checkout — which is what lets an @@ -333,6 +322,3 @@ members = [ # project depending on mcr writes in its own mcpp.toml. [workspace.dependencies] compat.openssl = { version = "3.5.9", override = true } - -[indices] -compat = { path = "." } diff --git a/pkgs/c/compat.cpptrace.lua b/pkgs/c/compat.cpptrace.lua index 3c165e1b..cbd4669b 100644 --- a/pkgs/c/compat.cpptrace.lua +++ b/pkgs/c/compat.cpptrace.lua @@ -39,7 +39,7 @@ -- than to CI. A future `libdwarf` feature can add it without changing anything -- a consumer writes. -- --- ── Two generated pieces ─────────────────────────────────────────────────── +-- ── A generated header and a define ─────────────────────────────────────── -- -- * `cpptrace/version.hpp` is a `configure_file` of `cmake/in/version-hpp.in` -- whose only inputs are the three version numbers in `project()`. Snapshot, @@ -62,21 +62,17 @@ -- lld-link: error: undefined symbol: __declspec(dllimport) -- cpptrace::v1::stacktrace_frame::operator!=(...) const -- --- ⚠️⚠️ MOVING IT TO `defines` DOES NOT FIX THAT, and this was measured +-- Moving it to `defines` does not fix that either, and this was measured -- rather than assumed: `defines` is package-private too. Read the compile -- database of a build that has both packages in it and libassert's eight -- TUs carry `-DLIBASSERT_STATIC_DEFINE` (its OWN package define) and zero -- `-DCPPTRACE_STATIC_DEFINE`, while cpptrace's 45 carry the reverse. --- `docs/repository-and-schema.md` says the same thing about a feature's --- `defines`. THERE IS NO INTERFACE-DEFINE KEY IN THIS GRAMMAR. -- --- So the delivery mechanism is a SHIM, the same lever `compat.gzip-hpp` and --- `compat.catch2` use: `basic.hpp` is the only header that reads the macro, --- and every public header funnels through it (`cpptrace.hpp`, --- `exceptions.hpp`, `formatting.hpp`, `from_current.hpp`, `gdb_jit.hpp`, --- `io.hpp`, `utils.hpp` — all of them include it), so ONE shim in front of --- it serves this package's TUs, libassert's, and any consumer's alike. --- `mcpp_generated` therefore sorts FIRST in include_dirs. +-- A FEATURE'S `defines` reach every TU that receives this package's include +-- directories, this package's and its consumers' (an interface +-- contribution), so the macro is a `staticlib` feature that `default` +-- implies: the same arrangement as CURL_STATICLIB in compat.curl and +-- LZMA_API_STATIC in compat.xz. -- -- The BACKEND macros below stay in `cxxflags` on purpose: those select -- which .cpp compiles to something and are nobody else's business. @@ -138,26 +134,9 @@ package = { -- `*/src` carries private headers the sources include as `utils/…`, -- `binary/…`; `mcpp_generated` carries the version header at the path -- `` upstream's public headers open. - -- ORDER MATTERS: mcpp_generated FIRST, so the basic.hpp shim below is - -- found before upstream's, which it then reaches with #include_next. include_dirs = { "mcpp_generated", "*/include", "*/src" }, generated_files = { - -- Delivers CPPTRACE_STATIC_DEFINE to every TU that opens a cpptrace - -- header, which no descriptor key can do. See the header note. - ["mcpp_generated/cpptrace/basic.hpp"] = [==[ -// mcpp-index shim: cpptrace is built as objects here, not as a shared library, -// so every declaration must be plain rather than dllimport/visibility-default. -// Upstream reads CPPTRACE_STATIC_DEFINE in this header and nowhere else, and -// every public cpptrace header includes this one. -#ifndef MCPP_COMPAT_CPPTRACE_STATIC_SHIM -#define MCPP_COMPAT_CPPTRACE_STATIC_SHIM -#ifndef CPPTRACE_STATIC_DEFINE -# define CPPTRACE_STATIC_DEFINE -#endif -#include_next -#endif -]==], ["mcpp_generated/cpptrace/version.hpp"] = [==[ /* configure_file() of cmake/in/version-hpp.in for cpptrace 1.0.4. */ #ifndef CPPTRACE_VERSION_HPP @@ -178,9 +157,10 @@ package = { targets = { ["cpptrace"] = { kind = "lib" } }, deps = { }, - -- Belt and braces for this package's OWN TUs; the shim above is what - -- reaches everyone else's. - defines = { "CPPTRACE_STATIC_DEFINE" }, + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "CPPTRACE_STATIC_DEFINE" } }, + }, linux = { cxxflags = { diff --git a/pkgs/c/compat.curand.lua b/pkgs/c/compat.curand.lua index b4855e7d..6f179b9f 100644 --- a/pkgs/c/compat.curand.lua +++ b/pkgs/c/compat.curand.lua @@ -31,7 +31,9 @@ package = { xpm = { linux = { - deps = { "xim:libcurand@10.3.10.19" }, + -- `xim:gcc-runtime` for the farm below: libcurand.so.10 needs + -- libgcc_s.so.1, which an LLVM artifact does not load. + deps = { "xim:libcurand@10.3.10.19", "xim:gcc-runtime" }, ["10.3.10.19"] = { -- Nothing downloaded matters; the content is the symlink farm -- install() builds. A stable, tiny anchor keeps the xpm entry @@ -125,15 +127,27 @@ end -- program load and run. That is what makes a farm of links sufficient here and -- a copy of the payload unnecessary. -- --- Only the libraries glibc 2.34 MERGED INTO libc are farmed. They are empty +-- The libraries glibc 2.34 MERGED INTO libc are farmed. They are empty -- compatibility stubs, so which payload version answers does not matter, and --- nothing else is loading them: `libc.so.6`, `libm.so.6` and `libstdc++.so.6` --- are already loaded on the executable's own behalf by the time the component --- asks, and are found by soname without a search. Farming those would risk a --- second copy of the C library in one address space, which is the one failure --- worse than this one. +-- nothing else is loading them: `libc.so.6` and `libm.so.6` are already loaded +-- on the executable's own behalf by the time the component asks, and are found +-- by soname without a search. Farming those would risk a second copy of the C +-- library in one address space, which is the one failure worse than this one. +-- +-- `libgcc_s.so.1` is farmed as well. `libcurand.so.10` needs it, and an mcpp +-- artifact built with LLVM links compiler-rt and libunwind, so nothing has +-- loaded it and the closure check refuses the program: +-- +-- libgcc_s.so.1 not found on the search path this artifact will actually use +-- +-- Farming it is safe for the reason compat.sycl-runtime records: the one copy +-- in this ecosystem is `xim:gcc-runtime`'s, so a GCC-built consumer that loads +-- it resolves the same file under the same soname. local function farm_libc_stubs(dst) - local names = { "librt.so.1", "libpthread.so.0", "libdl.so.2" } + local wanted = { + { pkg = "xim-x-glibc", names = { "librt.so.1", "libpthread.so.0", "libdl.so.2" } }, + { pkg = "xim-x-gcc-runtime", names = { "libgcc_s.so.1" } }, + } local roots = {} local pfx = pkginfo.install_dir() if pfx then roots[#roots + 1] = path.directory(path.directory(pfx)) end @@ -143,12 +157,14 @@ local function farm_libc_stubs(dst) roots[#roots + 1] = path.join((os.getenv and os.getenv("HOME")) or "", ".mcpp/registry/data/xpkgs") local found = 0 - for _, name in ipairs(names) do + for _, group in ipairs(wanted) do + for _, name in ipairs(group.names) do if not os.isfile(path.join(dst, name)) then for _, root in ipairs(roots) do local f = io.popen(string.format( - [[ls -1d "%s"/xim-x-glibc/*/lib64/%s 2>/dev/null | sort -V | tail -1]], - root, name)) + [[ls -1d "%s"/%s/*/lib64/%s "%s"/%s/*/lib/%s 2>/dev/null ]] + .. [[| sort -V | tail -1]], + root, group.pkg, name, root, group.pkg, name)) local hit = f and (f:read("l") or "") or "" if f then f:close() end if hit ~= "" then @@ -159,6 +175,7 @@ local function farm_libc_stubs(dst) end end end + end return found end @@ -189,7 +206,7 @@ function install() error(string.format("compat.curand: the payload at %s carries %d headers and %d " .. "shared libraries; both must be non-zero", src, nh, nl)) end - log.info("compat.curand: %d headers, %d libraries, %d C-library stubs from %s", + log.info("compat.curand: %d headers, %d libraries, %d runtime links from %s", nh, nl, ns, src) return true end diff --git a/pkgs/c/compat.fribidi.lua b/pkgs/c/compat.fribidi.lua index d8e16347..65b5bc07 100644 --- a/pkgs/c/compat.fribidi.lua +++ b/pkgs/c/compat.fribidi.lua @@ -181,9 +181,14 @@ package = { macosx = { cflags = { "-fPIC" } }, -- This is a static library: under _WIN32 fribidi-common.h would make -- every entry point __declspec(dllexport) (dllimport for consumers) - -- unless FRIBIDI_LIB_STATIC says otherwise. A consumer that includes - -- the headers on windows defines it too. - windows = { cflags = { "-DFRIBIDI_LIB_STATIC" } }, + -- unless FRIBIDI_LIB_STATIC says otherwise. Every TU that includes the + -- headers needs it, this package's and its consumers', so it is a + -- feature's define that `default` implies (as CURL_STATICLIB in + -- compat.curl). The header reads it only under _WIN32. + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "FRIBIDI_LIB_STATIC" } }, + }, targets = { fribidi = { kind = "lib" } }, }, diff --git a/pkgs/c/compat.libarchive.lua b/pkgs/c/compat.libarchive.lua index e658a4ba..0fcb486a 100644 --- a/pkgs/c/compat.libarchive.lua +++ b/pkgs/c/compat.libarchive.lua @@ -44,10 +44,22 @@ package = { include_dirs = {"*", "*/libarchive", "mcpp_generated/include"}, cflags = { "-D_GNU_SOURCE", - "-DLIBARCHIVE_STATIC", "-DPLATFORM_CONFIG_H=\\\"mcpp_libarchive_config.h\\\"", }, - -- macOS with musl as the C library (an openkal graph). libarchive + -- archive.h and archive_entry.h declare every function + -- __declspec(dllimport) on Windows unless LIBARCHIVE_STATIC is defined, + -- and this package is a static library. Every TU that includes them + -- needs it, this package's and its consumers': a consumer without it + -- calls through `__imp_archive_*` slots that lld-link makes, and a link + -- that collects unreferenced sections drops the functions behind them + -- (the first call jumps to the image's first byte; compat.xz states the + -- measurement). A feature's `defines` reach the consumer, and `default` + -- implies it unconditionally, as CURL_STATICLIB in compat.curl. + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "LIBARCHIVE_STATIC" } }, + }, + -- macOS under openkal (`kernel-abi = "openkal"`). libarchive -- reads __APPLE__ as "the Apple SDK is present" (TargetConditionals.h, -- copyfile, quarantine) in four private translation units and in the -- generated configuration below; the SDK is not in that graph. The @@ -55,17 +67,19 @@ package = { -- archive_entry.h do not test __APPLE__, so consumers read the same -- declarations. mcpp-index#434. target_cfg = { - -- Linux with musl as the C library (an openkal graph). The Linux - -- host configuration names the kernel's own headers (linux/fs.h, + -- Linux under openkal (`kernel-abi = "openkal"`). The Linux host + -- configuration names the kernel's own headers (linux/fs.h, -- linux/fiemap.h, linux/magic.h), which belong to the kernel's -- interface and not to that graph; they were reached before only -- because the compiler searched the host (mcpp#662). The same -- lines the configuration removes on every other system are - -- removed here. - ["cfg(all(linux, c-abi = \"musl\"))"] = { + -- removed here. The condition names the layer that lacks them, + -- not the C library: a native musl toolchain (`musl-gcc`) carries + -- the kernel's headers, and libarchive uses them there. + ["cfg(all(linux, kernel-abi = \"openkal\"))"] = { cflags = { "-DMCPP_LIBARCHIVE_NO_LINUX_UAPI" }, }, - ["cfg(all(macos, c-abi = \"musl\"))"] = { + ["cfg(all(macos, kernel-abi = \"openkal\"))"] = { cflags = { "-U__APPLE__" }, }, }, diff --git a/pkgs/c/compat.libassert.lua b/pkgs/c/compat.libassert.lua index 66054011..ed087428 100644 --- a/pkgs/c/compat.libassert.lua +++ b/pkgs/c/compat.libassert.lua @@ -31,14 +31,14 @@ -- too, not just this package's own TUs: the attribute is on the declarations -- they include. -- --- ⚠️ NO DESCRIPTOR KEY CAN DELIVER THAT. `defines` is package-private, same as --- `cxxflags` — measured on the compile database, and stated for features in --- `docs/repository-and-schema.md`. So the define is carried by a SHIM in front --- of `libassert/platform.hpp`, which is both the only header that reads the --- macro and the one every other libassert header includes. `compat.cpptrace` --- carries the identical arrangement for its own `basic.hpp`, and the reason it --- is not optional is written up there: on the MSVC ABI a `dllimport` --- declaration of a locally defined symbol is a link error, not a warning. +-- `defines` and `cxxflags` are package-private (measured on the compile +-- database). A feature's `defines` reach every TU that receives this package's +-- include directories, so the macro is a `staticlib` feature that `default` +-- implies, as CURL_STATICLIB in compat.curl and CPPTRACE_STATIC_DEFINE in +-- compat.cpptrace. The reason it is not optional is written up in +-- compat.cpptrace and compat.xz: on the MSVC ABI a `dllimport` declaration of a +-- locally defined symbol is a link error, or a call through a slot whose +-- function a collecting link dropped. -- -- ── One generated header ─────────────────────────────────────────────────── -- @@ -100,23 +100,9 @@ package = { import_std = false, c_standard = "c11", - -- ORDER MATTERS: mcpp_generated FIRST, for the platform.hpp shim. include_dirs = { "mcpp_generated", "*/include" }, generated_files = { - ["mcpp_generated/libassert/platform.hpp"] = [==[ -// mcpp-index shim: libassert is built as objects here, not as a shared -// library, so every declaration must be plain rather than -// dllimport/visibility-default. Upstream reads LIBASSERT_STATIC_DEFINE in this -// header and nowhere else, and every other libassert header includes this one. -#ifndef MCPP_COMPAT_LIBASSERT_STATIC_SHIM -#define MCPP_COMPAT_LIBASSERT_STATIC_SHIM -#ifndef LIBASSERT_STATIC_DEFINE -# define LIBASSERT_STATIC_DEFINE -#endif -#include_next -#endif -]==], ["mcpp_generated/libassert/version.hpp"] = [==[ /* configure_file() of cmake/in/version-hpp.in for libassert 2.2.1. */ #ifndef LIBASSERT_VERSION_HPP @@ -139,8 +125,9 @@ package = { targets = { ["libassert"] = { kind = "lib" } }, deps = { ["compat.cpptrace"] = "1.0.4" }, - -- Belt and braces for this package's own TUs; the shim above is what - -- reaches everyone else's. - defines = { "LIBASSERT_STATIC_DEFINE" }, + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "LIBASSERT_STATIC_DEFINE" } }, + }, }, } diff --git a/pkgs/c/compat.libcoro.lua b/pkgs/c/compat.libcoro.lua index a6f9abe7..f080b59d 100644 --- a/pkgs/c/compat.libcoro.lua +++ b/pkgs/c/compat.libcoro.lua @@ -47,10 +47,11 @@ -- include/coro/semaphore.hpp:5:10: fatal error: coro/export.hpp: No such file or directory -- -- The snapshot below is CMake's own output shape for `BASE_NAME CORO`, and --- `CORO_STATIC_DEFINE` goes in `defines` rather than `cxxflags` because the --- macro decorates DECLARATIONS a consumer includes — package-private flags --- would leave every consumer importing symbols from a shared library that is --- not being built. +-- `CORO_STATIC_DEFINE` is a feature's define that `default` implies, because +-- the macro decorates DECLARATIONS a consumer includes: package-private flags +-- and `defines` would leave every consumer importing symbols from a shared +-- library that is not being built. A feature's `defines` reach the consumer +-- (CURL_STATICLIB in compat.curl, LZMA_API_STATIC in compat.xz). -- -- Requires a C++20 coroutine-capable compiler, which every toolchain this -- index ships is; there is no flag to add on gcc/clang at C++23. @@ -162,7 +163,10 @@ package = { targets = { ["libcoro"] = { kind = "lib" } }, deps = { }, - defines = { "CORO_STATIC_DEFINE" }, + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "CORO_STATIC_DEFINE" } }, + }, linux = { -- The thread pool and the awaitable primitives are threads. diff --git a/pkgs/c/compat.sdl2.lua b/pkgs/c/compat.sdl2.lua index 3b768064..52c00960 100644 --- a/pkgs/c/compat.sdl2.lua +++ b/pkgs/c/compat.sdl2.lua @@ -37,6 +37,15 @@ -- -- All `mcpp` paths are GLOBS relative to the verdir; the leading `*/` absorbs -- the tarball's `SDL-release-2.32.10/` wrap layer. +-- +-- ONE HEADER LINE IS BACKPORTED in install(). Under an MSVC-ABI clang, +-- `SDL_endian.h` defines `_m_prefetch` as a stand-in for clang's +-- `prfchwintrin.h`; clang 23 makes `_m_prefetch` a builtin, and every consumer +-- TU that includes SDL.h stops at "definition of builtin function +-- '_m_prefetch'" (measured on windows-x86_64 with llvm@23.1.3). Upstream's SDL2 +-- branch guards the definition with `!_SDL_HAS_BUILTIN(_m_prefetch)` (commits +-- 9343246616 and 07c3b3fb7c), which no 2.32.x release carries yet. A shim cannot +-- reach it: SDL.h includes SDL_endian.h by a quoted include, found beside it. package = { spec = "1", namespace = "compat", @@ -54,6 +63,8 @@ package = { CN = "https://gitcode.com/mcpp-res/sdl2/releases/download/2.32.10-nosymlinks/sdl2-2.32.10-nosymlinks.tar.gz", }, sha256 = "8823b81a7ecec5c1785dfd3c1fdb6260899d4eaa07574365dd4b8da9e2830385", + -- 1: SDL_endian.h defines `_m_prefetch` only where the compiler has no builtin of it (install()). + revision = 1, }, }, macosx = { @@ -63,6 +74,8 @@ package = { CN = "https://gitcode.com/mcpp-res/sdl2/releases/download/2.32.10-nosymlinks/sdl2-2.32.10-nosymlinks.tar.gz", }, sha256 = "8823b81a7ecec5c1785dfd3c1fdb6260899d4eaa07574365dd4b8da9e2830385", + -- 1: SDL_endian.h defines `_m_prefetch` only where the compiler has no builtin of it (install()). + revision = 1, }, }, windows = { @@ -72,6 +85,8 @@ package = { CN = "https://gitcode.com/mcpp-res/sdl2/releases/download/2.32.10-nosymlinks/sdl2-2.32.10-nosymlinks.tar.gz", }, sha256 = "8823b81a7ecec5c1785dfd3c1fdb6260899d4eaa07574365dd4b8da9e2830385", + -- 1: SDL_endian.h defines `_m_prefetch` only where the compiler has no builtin of it (install()). + revision = 1, }, }, }, @@ -921,3 +936,38 @@ typedef unsigned int uintptr_t; }, }, } + +import("xim.libxpkg.pkginfo") +import("xim.libxpkg.log") + +-- The upstream SDL2-branch guard of `_m_prefetch` (see the header notes), then +-- the unpacked tree moved into the install dir as its single wrap level so the +-- `*/` globs keep matching (compat.libserial does the same). +function install() + local wrap = "SDL-release-" .. pkginfo.version() + local source = path.join(wrap, "include", "SDL_endian.h") + local content = io.readfile(source) + if not content then + log.error("compat.sdl2: cannot read %s", source) + return false + end + local before = "/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version,\n" + .. " so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */\n" + .. "#ifdef __clang__\n" + local after = "/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version,\n" + .. " so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */\n" + .. "#if defined(__clang__) && !_SDL_HAS_BUILTIN(_m_prefetch)\n" + local pattern = before:gsub("(%W)", "%%%1") + local patched, count = content:gsub(pattern, function() return after end) + if count ~= 1 then + log.error("compat.sdl2: expected 1 match of the _m_prefetch guard in %s, found %d", source, count) + return false + end + io.writefile(source, patched) + + local prefix = pkginfo.install_dir() + os.tryrm(prefix) + os.mkdir(prefix) + os.mv(wrap, path.join(prefix, wrap)) + return true +end diff --git a/pkgs/c/compat.xz.lua b/pkgs/c/compat.xz.lua index 979e12be..77c29ac9 100644 --- a/pkgs/c/compat.xz.lua +++ b/pkgs/c/compat.xz.lua @@ -52,6 +52,22 @@ package = { "*/src/liblzma/simple", "*/src/common", }, + + -- declares every function __declspec(dllimport) on Windows + -- unless LZMA_API_STATIC is defined, and this package is a static + -- library. A consumer that includes it without the macro calls through + -- `__imp_lzma_*` slots that lld-link makes for the locally defined + -- functions; a link that collects unreferenced sections (the release + -- profile, a test's link) drops the functions behind the slots, and + -- the first call jumps to the image's first byte. The macro reaches + -- every TU that includes the header the same way CURL_STATICLIB does + -- in compat.curl: a feature's `defines` reach the consumer, and + -- `default` implies it unconditionally. + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "LZMA_API_STATIC" } }, + }, + cflags = { "-D_GNU_SOURCE", "-DSIZEOF_SIZE_T=8", diff --git a/pkgs/c/compat.yaml-cpp.lua b/pkgs/c/compat.yaml-cpp.lua index 67c3a04d..7ae7f705 100644 --- a/pkgs/c/compat.yaml-cpp.lua +++ b/pkgs/c/compat.yaml-cpp.lua @@ -30,9 +30,10 @@ -- of these statically linked objects fails with `__declspec(dllimport)` -- undefined symbols; on ELF it is only the difference between -- visibility("default") and nothing, so Linux never notices. A descriptor's --- `defines` reach only this package's own TUs, so the define is delivered to --- consumers by a same-named shim that every public header already funnels --- through, and tests/examples/yaml-cpp asserts it arrived. +-- `defines` reach only this package's own TUs; a feature's `defines` reach +-- every TU that receives its include directories, so the macro is a +-- `staticlib` feature that `default` implies (as CURL_STATICLIB in +-- compat.curl), and tests/examples/yaml-cpp asserts it arrived. -- -- openkal: nothing here is conditional on it. yaml-cpp needs only the C++ -- standard library, and its one compiler-specific branch (dragonbox.h's @@ -102,29 +103,8 @@ package = { language = "c++23", import_std = false, - -- Consumers write `#include `. ORDER MATTERS: - -- mcpp_generated FIRST, so the dll.h shim below is found before - -- upstream's, which it then reaches with #include_next. - include_dirs = { "mcpp_generated", "*/include" }, - - generated_files = { - -- Delivers YAML_CPP_STATIC_DEFINE to every TU that opens a - -- yaml-cpp header, which no descriptor key can do. See the header - -- note. - ["mcpp_generated/yaml-cpp/dll.h"] = [==[ -// mcpp-index shim: yaml-cpp is built as objects here, not as a shared library, -// so every declaration must be plain rather than dllimport/visibility-default. -// Upstream reads YAML_CPP_STATIC_DEFINE in this header and nowhere else, and -// every public yaml-cpp header reaches this one. -#ifndef MCPP_COMPAT_YAML_CPP_STATIC_SHIM -#define MCPP_COMPAT_YAML_CPP_STATIC_SHIM -#ifndef YAML_CPP_STATIC_DEFINE -# define YAML_CPP_STATIC_DEFINE -#endif -#include_next -#endif -]==], - }, + -- Consumers write `#include `. + include_dirs = { "*/include" }, sources = { "*/src/*.cpp", @@ -134,9 +114,10 @@ package = { targets = { ["yaml-cpp"] = { kind = "lib" } }, deps = { }, - -- Belt and braces for this package's OWN TUs; the shim above is what - -- reaches everyone else's. - defines = { "YAML_CPP_STATIC_DEFINE" }, + features = { + ["default"] = { implies = { "staticlib" } }, + ["staticlib"] = { defines = { "YAML_CPP_STATIC_DEFINE" } }, + }, -- 0.8.0's src/emitterutils.cpp names uint16_t/uint32_t unqualified -- and includes neither nor (0.9.0 added it). It diff --git a/pkgs/mwrap/accesskit.lua b/pkgs/mwrap/accesskit.lua index 83c71b3a..379ad082 100644 --- a/pkgs/mwrap/accesskit.lua +++ b/pkgs/mwrap/accesskit.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (accesskit-m mwrap-0.23.1). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 0.23.1.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.accesskit = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["0.23.1.1"] = { + url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1.1/accesskit-m-0.23.1.1.tar.gz", + sha256 = "3dcca07da6af75e15775dab9db3c1ced1c4a90d7409e5697623281ad18abb63a", + }, ["0.23.1"] = { url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1/accesskit-m-0.23.1.tar.gz", sha256 = "799928a7914f3eef7808f358f6bd14c8b18b141e0cd4f34eff99ea8b282fe893", }, }, macosx = { + ["0.23.1.1"] = { + url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1.1/accesskit-m-0.23.1.1.tar.gz", + sha256 = "3dcca07da6af75e15775dab9db3c1ced1c4a90d7409e5697623281ad18abb63a", + }, ["0.23.1"] = { url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1/accesskit-m-0.23.1.tar.gz", sha256 = "799928a7914f3eef7808f358f6bd14c8b18b141e0cd4f34eff99ea8b282fe893", }, }, windows = { + ["0.23.1.1"] = { + url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1.1/accesskit-m-0.23.1.1.tar.gz", + sha256 = "3dcca07da6af75e15775dab9db3c1ced1c4a90d7409e5697623281ad18abb63a", + }, ["0.23.1"] = { url = "https://github.com/mcpplibs/accesskit-m/releases/download/mwrap-0.23.1/accesskit-m-0.23.1.tar.gz", sha256 = "799928a7914f3eef7808f358f6bd14c8b18b141e0cd4f34eff99ea8b282fe893", diff --git a/pkgs/mwrap/box2d.lua b/pkgs/mwrap/box2d.lua index 86cd9023..8be952ea 100644 --- a/pkgs/mwrap/box2d.lua +++ b/pkgs/mwrap/box2d.lua @@ -4,6 +4,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.box2d (Box2D 3.2.0, -- single precision, -ffp-contract=off), is MIT, linked statically: the package -- deploys Box2D's README and LICENSE beside programs (runtime.deploy). +-- +-- 3.2.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.box2d = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -20,6 +24,13 @@ package = { }, xpm = { linux = { + ["3.2.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0.1/box2d-m-3.2.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-box2d/releases/download/3.2.0.1/box2d-m-3.2.0.1.tar.gz", + }, + sha256 = "a6fe9875e8824fe19c4591e502e20ad24ac6348e7542ece164d7a9c2eed66e39", + }, ["3.2.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0/box2d-m-3.2.0.tar.gz", @@ -29,6 +40,13 @@ package = { }, }, macosx = { + ["3.2.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0.1/box2d-m-3.2.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-box2d/releases/download/3.2.0.1/box2d-m-3.2.0.1.tar.gz", + }, + sha256 = "a6fe9875e8824fe19c4591e502e20ad24ac6348e7542ece164d7a9c2eed66e39", + }, ["3.2.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0/box2d-m-3.2.0.tar.gz", @@ -38,6 +56,13 @@ package = { }, }, windows = { + ["3.2.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0.1/box2d-m-3.2.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-box2d/releases/download/3.2.0.1/box2d-m-3.2.0.1.tar.gz", + }, + sha256 = "a6fe9875e8824fe19c4591e502e20ad24ac6348e7542ece164d7a9c2eed66e39", + }, ["3.2.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/box2d-m/releases/download/mwrap-3.2.0/box2d-m-3.2.0.tar.gz", diff --git a/pkgs/mwrap/concurrentqueue.lua b/pkgs/mwrap/concurrentqueue.lua index b087d872..f83cd7ea 100644 --- a/pkgs/mwrap/concurrentqueue.lua +++ b/pkgs/mwrap/concurrentqueue.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (concurrentqueue-m mwrap-1.0.5). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 1.0.5.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.concurrentqueue = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["1.0.5.1"] = { + url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5.1/concurrentqueue-m-1.0.5.1.tar.gz", + sha256 = "767aad0b46b9923ebf0adc2cd2099ad96ecee8942e73cfc461958aa39bf0d6d7", + }, ["1.0.5"] = { url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5/concurrentqueue-m-1.0.5.tar.gz", sha256 = "896e0adb535d74633bed4cd10cfe161bc6b45ff9b386faf141ab808f196050d1", }, }, macosx = { + ["1.0.5.1"] = { + url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5.1/concurrentqueue-m-1.0.5.1.tar.gz", + sha256 = "767aad0b46b9923ebf0adc2cd2099ad96ecee8942e73cfc461958aa39bf0d6d7", + }, ["1.0.5"] = { url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5/concurrentqueue-m-1.0.5.tar.gz", sha256 = "896e0adb535d74633bed4cd10cfe161bc6b45ff9b386faf141ab808f196050d1", }, }, windows = { + ["1.0.5.1"] = { + url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5.1/concurrentqueue-m-1.0.5.1.tar.gz", + sha256 = "767aad0b46b9923ebf0adc2cd2099ad96ecee8942e73cfc461958aa39bf0d6d7", + }, ["1.0.5"] = { url = "https://github.com/mcpplibs/concurrentqueue-m/releases/download/mwrap-1.0.5/concurrentqueue-m-1.0.5.tar.gz", sha256 = "896e0adb535d74633bed4cd10cfe161bc6b45ff9b386faf141ab808f196050d1", diff --git a/pkgs/mwrap/dr_libs.lua b/pkgs/mwrap/dr_libs.lua index 471a850d..f9439e86 100644 --- a/pkgs/mwrap/dr_libs.lua +++ b/pkgs/mwrap/dr_libs.lua @@ -6,6 +6,10 @@ -- is a choice of Unlicense or MIT-0, linked statically: the package deploys -- dr_libs' README and LICENSE beside programs (runtime.deploy) with its own -- LICENSE and NOTICE. +-- +-- 2026.03.03.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.dr_libs = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -22,6 +26,13 @@ package = { }, xpm = { linux = { + ["2026.03.03.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-dr_libs/releases/download/2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + }, + sha256 = "03e13284513064882e86868fb9085657bd16e6ecd28ccc14160a780aa0a85b97", + }, ["2026.03.03"] = { url = { GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03/dr_libs-m-2026.03.03.tar.gz", @@ -31,6 +42,13 @@ package = { }, }, macosx = { + ["2026.03.03.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-dr_libs/releases/download/2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + }, + sha256 = "03e13284513064882e86868fb9085657bd16e6ecd28ccc14160a780aa0a85b97", + }, ["2026.03.03"] = { url = { GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03/dr_libs-m-2026.03.03.tar.gz", @@ -40,6 +58,13 @@ package = { }, }, windows = { + ["2026.03.03.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-dr_libs/releases/download/2026.03.03.1/dr_libs-m-2026.03.03.1.tar.gz", + }, + sha256 = "03e13284513064882e86868fb9085657bd16e6ecd28ccc14160a780aa0a85b97", + }, ["2026.03.03"] = { url = { GLOBAL = "https://github.com/mcpplibs/dr_libs-m/releases/download/mwrap-2026.03.03/dr_libs-m-2026.03.03.tar.gz", diff --git a/pkgs/mwrap/freetype.lua b/pkgs/mwrap/freetype.lua index 07d3afb1..bf31164d 100644 --- a/pkgs/mwrap/freetype.lua +++ b/pkgs/mwrap/freetype.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (freetype-m mwrap-2.13.3). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 2.13.3.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.freetype = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["2.13.3.1"] = { + url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3.1/freetype-m-2.13.3.1.tar.gz", + sha256 = "dca3f3f0e76b32a155e22cd0396963bee82ddfe264c72cf73c4f6d64f06d58e5", + }, ["2.13.3"] = { url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3/freetype-m-2.13.3.tar.gz", sha256 = "a9c2d5dc03be08139ceb49d5487346b8130ed2702f5ff464e3584ef7aea16cca", }, }, macosx = { + ["2.13.3.1"] = { + url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3.1/freetype-m-2.13.3.1.tar.gz", + sha256 = "dca3f3f0e76b32a155e22cd0396963bee82ddfe264c72cf73c4f6d64f06d58e5", + }, ["2.13.3"] = { url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3/freetype-m-2.13.3.tar.gz", sha256 = "a9c2d5dc03be08139ceb49d5487346b8130ed2702f5ff464e3584ef7aea16cca", }, }, windows = { + ["2.13.3.1"] = { + url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3.1/freetype-m-2.13.3.1.tar.gz", + sha256 = "dca3f3f0e76b32a155e22cd0396963bee82ddfe264c72cf73c4f6d64f06d58e5", + }, ["2.13.3"] = { url = "https://github.com/mcpplibs/freetype-m/releases/download/mwrap-2.13.3/freetype-m-2.13.3.tar.gz", sha256 = "a9c2d5dc03be08139ceb49d5487346b8130ed2702f5ff464e3584ef7aea16cca", diff --git a/pkgs/mwrap/fribidi.lua b/pkgs/mwrap/fribidi.lua index 8a8c772b..2e636e67 100644 --- a/pkgs/mwrap/fribidi.lua +++ b/pkgs/mwrap/fribidi.lua @@ -5,6 +5,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.fribidi, stays -- LGPL-2.1-or-later and is linked statically: the package deploys FriBidi's -- COPYING, AUTHORS and README beside programs (runtime.deploy). +-- +-- 1.0.16.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.fribidi = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -21,18 +25,30 @@ package = { }, xpm = { linux = { + ["1.0.16.1"] = { + url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16.1/fribidi-m-1.0.16.1.tar.gz", + sha256 = "9a8af5aada70bd54c7690b58d1e6436848711e46aaea096647b5d688ece4a6ab", + }, ["1.0.16"] = { url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16/fribidi-m-1.0.16.tar.gz", sha256 = "e05d6f3407689e8372a9876c1a0089df38cfbe33a7df9174ef80c134b7b198f4", }, }, macosx = { + ["1.0.16.1"] = { + url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16.1/fribidi-m-1.0.16.1.tar.gz", + sha256 = "9a8af5aada70bd54c7690b58d1e6436848711e46aaea096647b5d688ece4a6ab", + }, ["1.0.16"] = { url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16/fribidi-m-1.0.16.tar.gz", sha256 = "e05d6f3407689e8372a9876c1a0089df38cfbe33a7df9174ef80c134b7b198f4", }, }, windows = { + ["1.0.16.1"] = { + url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16.1/fribidi-m-1.0.16.1.tar.gz", + sha256 = "9a8af5aada70bd54c7690b58d1e6436848711e46aaea096647b5d688ece4a6ab", + }, ["1.0.16"] = { url = "https://github.com/mcpplibs/fribidi-m/releases/download/mwrap-1.0.16/fribidi-m-1.0.16.tar.gz", sha256 = "e05d6f3407689e8372a9876c1a0089df38cfbe33a7df9174ef80c134b7b198f4", diff --git a/pkgs/mwrap/godot_cpp.lua b/pkgs/mwrap/godot_cpp.lua index 336c6a0b..2e57528c 100644 --- a/pkgs/mwrap/godot_cpp.lua +++ b/pkgs/mwrap/godot_cpp.lua @@ -1,4 +1,8 @@ -- Immutable upstream-aligned mwrap source release; GLOBAL and CN bytes are identical. +-- +-- 10.0.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.godot_cpp = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -15,6 +19,13 @@ package = { }, xpm = { linux = { + ["10.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-godot-cpp/releases/download/10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + }, + sha256 = "3dfa0507dcff404ac95cd7e2b66ef70c0bf7e56859f4b791cc484a9c9375dcf5", + }, ["10.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0/godot-cpp-m-10.0.0.tar.gz", @@ -24,6 +35,13 @@ package = { }, }, macosx = { + ["10.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-godot-cpp/releases/download/10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + }, + sha256 = "3dfa0507dcff404ac95cd7e2b66ef70c0bf7e56859f4b791cc484a9c9375dcf5", + }, ["10.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0/godot-cpp-m-10.0.0.tar.gz", @@ -33,6 +51,13 @@ package = { }, }, windows = { + ["10.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-godot-cpp/releases/download/10.0.0.1/godot-cpp-m-10.0.0.1.tar.gz", + }, + sha256 = "3dfa0507dcff404ac95cd7e2b66ef70c0bf7e56859f4b791cc484a9c9375dcf5", + }, ["10.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/godot-cpp-m/releases/download/mwrap-10.0.0/godot-cpp-m-10.0.0.tar.gz", diff --git a/pkgs/mwrap/harfbuzz.lua b/pkgs/mwrap/harfbuzz.lua index 981d0226..4389b0b6 100644 --- a/pkgs/mwrap/harfbuzz.lua +++ b/pkgs/mwrap/harfbuzz.lua @@ -6,6 +6,10 @@ -- FreeType backend over compat.freetype), stays under HarfBuzz's "Old MIT" -- license and is linked statically: the package deploys HarfBuzz's COPYING, -- AUTHORS and README beside programs (runtime.deploy). +-- +-- 14.3.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.harfbuzz = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -22,18 +26,30 @@ package = { }, xpm = { linux = { + ["14.3.0.1"] = { + url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0.1/harfbuzz-m-14.3.0.1.tar.gz", + sha256 = "b3bf249392be5796580d5dab4e25beaac32d7ed236503f4eaaa3f84cdba5b817", + }, ["14.3.0"] = { url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0/harfbuzz-m-14.3.0.tar.gz", sha256 = "29711d07c3876229e4c0df4bcaa6595a844f92b2f749813cde979edff1c30ee1", }, }, macosx = { + ["14.3.0.1"] = { + url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0.1/harfbuzz-m-14.3.0.1.tar.gz", + sha256 = "b3bf249392be5796580d5dab4e25beaac32d7ed236503f4eaaa3f84cdba5b817", + }, ["14.3.0"] = { url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0/harfbuzz-m-14.3.0.tar.gz", sha256 = "29711d07c3876229e4c0df4bcaa6595a844f92b2f749813cde979edff1c30ee1", }, }, windows = { + ["14.3.0.1"] = { + url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0.1/harfbuzz-m-14.3.0.1.tar.gz", + sha256 = "b3bf249392be5796580d5dab4e25beaac32d7ed236503f4eaaa3f84cdba5b817", + }, ["14.3.0"] = { url = "https://github.com/mcpplibs/harfbuzz-m/releases/download/mwrap-14.3.0/harfbuzz-m-14.3.0.tar.gz", sha256 = "29711d07c3876229e4c0df4bcaa6595a844f92b2f749813cde979edff1c30ee1", diff --git a/pkgs/mwrap/imgui.lua b/pkgs/mwrap/imgui.lua index 4c6bd3c4..0c5f80b9 100644 --- a/pkgs/mwrap/imgui.lua +++ b/pkgs/mwrap/imgui.lua @@ -1,4 +1,8 @@ -- Immutable upstream-aligned mwrap source release; GLOBAL and CN bytes are identical. +-- +-- 1.92.8.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.imgui = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -15,6 +19,13 @@ package = { }, xpm = { linux = { + ["1.92.8.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8.1/imgui-m-1.92.8.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-imgui/releases/download/1.92.8.1/imgui-m-1.92.8.1.tar.gz", + }, + sha256 = "470acde195fa51f2011bf7d377c569184fc81bc1afd684d787388cd66b29f22f", + }, ["1.92.8"] = { url = { GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8/imgui-m-1.92.8.tar.gz", @@ -24,6 +35,13 @@ package = { }, }, macosx = { + ["1.92.8.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8.1/imgui-m-1.92.8.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-imgui/releases/download/1.92.8.1/imgui-m-1.92.8.1.tar.gz", + }, + sha256 = "470acde195fa51f2011bf7d377c569184fc81bc1afd684d787388cd66b29f22f", + }, ["1.92.8"] = { url = { GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8/imgui-m-1.92.8.tar.gz", @@ -33,6 +51,13 @@ package = { }, }, windows = { + ["1.92.8.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8.1/imgui-m-1.92.8.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-imgui/releases/download/1.92.8.1/imgui-m-1.92.8.1.tar.gz", + }, + sha256 = "470acde195fa51f2011bf7d377c569184fc81bc1afd684d787388cd66b29f22f", + }, ["1.92.8"] = { url = { GLOBAL = "https://github.com/mcpplibs/imgui-m/releases/download/mwrap-1.92.8/imgui-m-1.92.8.tar.gz", diff --git a/pkgs/mwrap/libarchive.lua b/pkgs/mwrap/libarchive.lua index 7425acab..a7f1c1dc 100644 --- a/pkgs/mwrap/libarchive.lua +++ b/pkgs/mwrap/libarchive.lua @@ -5,6 +5,10 @@ -- (libarchive 3.8.7), is BSD-2-Clause with the exceptions its COPYING lists, -- linked statically: the package deploys its README and COPYING beside -- programs (runtime.deploy). +-- +-- 3.8.7.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.libarchive = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -21,6 +25,13 @@ package = { }, xpm = { linux = { + ["3.8.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libarchive/releases/download/3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + }, + sha256 = "15e94416622a9cf34011ef274cbe3d03da6fb46207ac63ad18d9dd725279eebb", + }, ["3.8.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7/libarchive-m-3.8.7.tar.gz", @@ -30,6 +41,13 @@ package = { }, }, macosx = { + ["3.8.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libarchive/releases/download/3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + }, + sha256 = "15e94416622a9cf34011ef274cbe3d03da6fb46207ac63ad18d9dd725279eebb", + }, ["3.8.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7/libarchive-m-3.8.7.tar.gz", @@ -39,6 +57,13 @@ package = { }, }, windows = { + ["3.8.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libarchive/releases/download/3.8.7.1/libarchive-m-3.8.7.1.tar.gz", + }, + sha256 = "15e94416622a9cf34011ef274cbe3d03da6fb46207ac63ad18d9dd725279eebb", + }, ["3.8.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/libarchive-m/releases/download/mwrap-3.8.7/libarchive-m-3.8.7.tar.gz", diff --git a/pkgs/mwrap/libc.lua b/pkgs/mwrap/libc.lua index d5a6923e..81229fc6 100644 --- a/pkgs/mwrap/libc.lua +++ b/pkgs/mwrap/libc.lua @@ -3,6 +3,10 @@ -- -- The wrapper is Apache-2.0 and links nothing: the implementation is the -- target's C library. The version names the standard, ISO/IEC 9899:2018 (C17). +-- +-- 17.0.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.libc = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -19,6 +23,13 @@ package = { }, xpm = { linux = { + ["17.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0.1/libc-m-17.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libc/releases/download/17.0.0.1/libc-m-17.0.0.1.tar.gz", + }, + sha256 = "b1837a18a9c78e6c0e252b7bfdf036093ccb849e9c2232b2f439c299ee12d61f", + }, ["17.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0/libc-m-17.0.0.tar.gz", @@ -28,6 +39,13 @@ package = { }, }, macosx = { + ["17.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0.1/libc-m-17.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libc/releases/download/17.0.0.1/libc-m-17.0.0.1.tar.gz", + }, + sha256 = "b1837a18a9c78e6c0e252b7bfdf036093ccb849e9c2232b2f439c299ee12d61f", + }, ["17.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0/libc-m-17.0.0.tar.gz", @@ -37,6 +55,13 @@ package = { }, }, windows = { + ["17.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0.1/libc-m-17.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-libc/releases/download/17.0.0.1/libc-m-17.0.0.1.tar.gz", + }, + sha256 = "b1837a18a9c78e6c0e252b7bfdf036093ccb849e9c2232b2f439c299ee12d61f", + }, ["17.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/libc-m/releases/download/mwrap-17.0.0/libc-m-17.0.0.tar.gz", diff --git a/pkgs/mwrap/libpng.lua b/pkgs/mwrap/libpng.lua index bef5e38f..006449b7 100644 --- a/pkgs/mwrap/libpng.lua +++ b/pkgs/mwrap/libpng.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (libpng-m mwrap-1.6.43). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 1.6.43.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.libpng = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["1.6.43.1"] = { + url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43.1/libpng-m-1.6.43.1.tar.gz", + sha256 = "541f7102f7856c25cdbd84c153abafc4c7903fa46c2e3faeea1f82d437c434dd", + }, ["1.6.43"] = { url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43/libpng-m-1.6.43.tar.gz", sha256 = "44b62160e99e9febf908da87774447376c847f304674c4e3654c9bc2ab8aeb85", }, }, macosx = { + ["1.6.43.1"] = { + url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43.1/libpng-m-1.6.43.1.tar.gz", + sha256 = "541f7102f7856c25cdbd84c153abafc4c7903fa46c2e3faeea1f82d437c434dd", + }, ["1.6.43"] = { url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43/libpng-m-1.6.43.tar.gz", sha256 = "44b62160e99e9febf908da87774447376c847f304674c4e3654c9bc2ab8aeb85", }, }, windows = { + ["1.6.43.1"] = { + url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43.1/libpng-m-1.6.43.1.tar.gz", + sha256 = "541f7102f7856c25cdbd84c153abafc4c7903fa46c2e3faeea1f82d437c434dd", + }, ["1.6.43"] = { url = "https://github.com/mcpplibs/libpng-m/releases/download/mwrap-1.6.43/libpng-m-1.6.43.tar.gz", sha256 = "44b62160e99e9febf908da87774447376c847f304674c4e3654c9bc2ab8aeb85", diff --git a/pkgs/mwrap/libvpx.lua b/pkgs/mwrap/libvpx.lua index 95152325..c68fcb4b 100644 --- a/pkgs/mwrap/libvpx.lua +++ b/pkgs/mwrap/libvpx.lua @@ -7,6 +7,10 @@ -- 1.17.0, VP9) and compat.libwebm (libwebm 1.0.0.32, the WebM container). The -- package deploys each one's README, LICENSE, PATENTS and AUTHORS beside -- programs (runtime.deploy). +-- +-- 1.17.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.libvpx = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -23,18 +27,30 @@ package = { }, xpm = { linux = { + ["1.17.0.1"] = { + url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0.1/libvpx-m-1.17.0.1.tar.gz", + sha256 = "6073e1a86ecd153804c102b1a3d2e0408d8595a10046c86a97f3c687524da734", + }, ["1.17.0"] = { url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0/libvpx-m-1.17.0.tar.gz", sha256 = "e6a5a062923b17961d44c7d1d74cd4190f774d4eb38d639607530ff987669211", }, }, macosx = { + ["1.17.0.1"] = { + url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0.1/libvpx-m-1.17.0.1.tar.gz", + sha256 = "6073e1a86ecd153804c102b1a3d2e0408d8595a10046c86a97f3c687524da734", + }, ["1.17.0"] = { url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0/libvpx-m-1.17.0.tar.gz", sha256 = "e6a5a062923b17961d44c7d1d74cd4190f774d4eb38d639607530ff987669211", }, }, windows = { + ["1.17.0.1"] = { + url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0.1/libvpx-m-1.17.0.1.tar.gz", + sha256 = "6073e1a86ecd153804c102b1a3d2e0408d8595a10046c86a97f3c687524da734", + }, ["1.17.0"] = { url = "https://github.com/mcpplibs/libvpx-m/releases/download/mwrap-1.17.0/libvpx-m-1.17.0.tar.gz", sha256 = "e6a5a062923b17961d44c7d1d74cd4190f774d4eb38d639607530ff987669211", diff --git a/pkgs/mwrap/libwebp.lua b/pkgs/mwrap/libwebp.lua index 2cf27a43..790eb6a8 100644 --- a/pkgs/mwrap/libwebp.lua +++ b/pkgs/mwrap/libwebp.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (libwebp-m mwrap-1.5.0). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 1.5.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.libwebp = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["1.5.0.1"] = { + url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0.1/libwebp-m-1.5.0.1.tar.gz", + sha256 = "b4bb8c3fb6064289d4e8f99e33f5d5b83cca30a588558956c465633cceff6f13", + }, ["1.5.0"] = { url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0/libwebp-m-1.5.0.tar.gz", sha256 = "2a085e5e795f0dbc110f26ae8f423dcd2e517f7f6d7dd6f06e8877dea4dbf6a0", }, }, macosx = { + ["1.5.0.1"] = { + url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0.1/libwebp-m-1.5.0.1.tar.gz", + sha256 = "b4bb8c3fb6064289d4e8f99e33f5d5b83cca30a588558956c465633cceff6f13", + }, ["1.5.0"] = { url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0/libwebp-m-1.5.0.tar.gz", sha256 = "2a085e5e795f0dbc110f26ae8f423dcd2e517f7f6d7dd6f06e8877dea4dbf6a0", }, }, windows = { + ["1.5.0.1"] = { + url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0.1/libwebp-m-1.5.0.1.tar.gz", + sha256 = "b4bb8c3fb6064289d4e8f99e33f5d5b83cca30a588558956c465633cceff6f13", + }, ["1.5.0"] = { url = "https://github.com/mcpplibs/libwebp-m/releases/download/mwrap-1.5.0/libwebp-m-1.5.0.tar.gz", sha256 = "2a085e5e795f0dbc110f26ae8f423dcd2e517f7f6d7dd6f06e8877dea4dbf6a0", diff --git a/pkgs/mwrap/llamacpp.lua b/pkgs/mwrap/llamacpp.lua index 8cabcde4..8d917867 100644 --- a/pkgs/mwrap/llamacpp.lua +++ b/pkgs/mwrap/llamacpp.lua @@ -1,4 +1,8 @@ -- Immutable upstream-aligned mwrap source release; GLOBAL and CN bytes are identical. +-- +-- b10069.2 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.llamacpp = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -15,6 +19,13 @@ package = { }, xpm = { linux = { + ["b10069.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069.2/llama.cpp-m-b10069.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-llamacpp/releases/download/b10069.2/llama.cpp-m-b10069.2.tar.gz", + }, + sha256 = "f27377094656168a91f326af427580d7c9ebf22307e0c36f46cea009e5cd93d0", + }, ["b10069"] = { url = { GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069/llama.cpp-m-b10069.tar.gz", @@ -24,6 +35,13 @@ package = { }, }, macosx = { + ["b10069.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069.2/llama.cpp-m-b10069.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-llamacpp/releases/download/b10069.2/llama.cpp-m-b10069.2.tar.gz", + }, + sha256 = "f27377094656168a91f326af427580d7c9ebf22307e0c36f46cea009e5cd93d0", + }, ["b10069"] = { url = { GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069/llama.cpp-m-b10069.tar.gz", @@ -33,6 +51,13 @@ package = { }, }, windows = { + ["b10069.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069.2/llama.cpp-m-b10069.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-llamacpp/releases/download/b10069.2/llama.cpp-m-b10069.2.tar.gz", + }, + sha256 = "f27377094656168a91f326af427580d7c9ebf22307e0c36f46cea009e5cd93d0", + }, ["b10069"] = { url = { GLOBAL = "https://github.com/mcpplibs/llama.cpp-m/releases/download/mwrap-b10069/llama.cpp-m-b10069.tar.gz", diff --git a/pkgs/mwrap/lua.lua b/pkgs/mwrap/lua.lua index e22ee5ec..9308cb6c 100644 --- a/pkgs/mwrap/lua.lua +++ b/pkgs/mwrap/lua.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (lua-m mwrap-5.4.7). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 5.4.7.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.lua = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["5.4.7.1"] = { + url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7.1/lua-m-5.4.7.1.tar.gz", + sha256 = "1636a90c2bce110625a325b7633ddf3f85a850c03ad0c1be75e82d79709465ea", + }, ["5.4.7"] = { url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7/lua-m-5.4.7.tar.gz", sha256 = "75716263adb28f79e01048c73e8a7193bae5fb68baf18d93d937706b9ca7c1d5", }, }, macosx = { + ["5.4.7.1"] = { + url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7.1/lua-m-5.4.7.1.tar.gz", + sha256 = "1636a90c2bce110625a325b7633ddf3f85a850c03ad0c1be75e82d79709465ea", + }, ["5.4.7"] = { url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7/lua-m-5.4.7.tar.gz", sha256 = "75716263adb28f79e01048c73e8a7193bae5fb68baf18d93d937706b9ca7c1d5", }, }, windows = { + ["5.4.7.1"] = { + url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7.1/lua-m-5.4.7.1.tar.gz", + sha256 = "1636a90c2bce110625a325b7633ddf3f85a850c03ad0c1be75e82d79709465ea", + }, ["5.4.7"] = { url = "https://github.com/mcpplibs/lua-m/releases/download/mwrap-5.4.7/lua-m-5.4.7.tar.gz", sha256 = "75716263adb28f79e01048c73e8a7193bae5fb68baf18d93d937706b9ca7c1d5", diff --git a/pkgs/mwrap/md4c.lua b/pkgs/mwrap/md4c.lua index bd511649..8ebdc813 100644 --- a/pkgs/mwrap/md4c.lua +++ b/pkgs/mwrap/md4c.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (md4c-m mwrap-0.5.3). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 0.5.3.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.md4c = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["0.5.3.1"] = { + url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3.1/md4c-m-0.5.3.1.tar.gz", + sha256 = "dfb31e7c9f8e449cbbbfb9bc254a8a118a5c307a43ad13ca4479b9dca4b8dbd8", + }, ["0.5.3"] = { url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3/md4c-m-0.5.3.tar.gz", sha256 = "10f7cdffab919bc97e2cf713c0a784e698568eca8a2331ab386515e5bf7743ac", }, }, macosx = { + ["0.5.3.1"] = { + url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3.1/md4c-m-0.5.3.1.tar.gz", + sha256 = "dfb31e7c9f8e449cbbbfb9bc254a8a118a5c307a43ad13ca4479b9dca4b8dbd8", + }, ["0.5.3"] = { url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3/md4c-m-0.5.3.tar.gz", sha256 = "10f7cdffab919bc97e2cf713c0a784e698568eca8a2331ab386515e5bf7743ac", }, }, windows = { + ["0.5.3.1"] = { + url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3.1/md4c-m-0.5.3.1.tar.gz", + sha256 = "dfb31e7c9f8e449cbbbfb9bc254a8a118a5c307a43ad13ca4479b9dca4b8dbd8", + }, ["0.5.3"] = { url = "https://github.com/mcpplibs/md4c-m/releases/download/mwrap-0.5.3/md4c-m-0.5.3.tar.gz", sha256 = "10f7cdffab919bc97e2cf713c0a784e698568eca8a2331ab386515e5bf7743ac", diff --git a/pkgs/mwrap/mimalloc.lua b/pkgs/mwrap/mimalloc.lua index e3863415..6ddddd20 100644 --- a/pkgs/mwrap/mimalloc.lua +++ b/pkgs/mwrap/mimalloc.lua @@ -4,6 +4,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.mimalloc (mimalloc -- 3.6.1), is MIT, linked statically: the package deploys mimalloc's README and -- LICENSE beside programs (runtime.deploy). +-- +-- 3.6.1.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.mimalloc = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -20,6 +24,13 @@ package = { }, xpm = { linux = { + ["3.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-mimalloc/releases/download/3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + }, + sha256 = "e4b8104f9d34fee85c0e49fc4b2c291bc57db558b5c9b38c063cfa87a24a486d", + }, ["3.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1/mimalloc-m-3.6.1.tar.gz", @@ -29,6 +40,13 @@ package = { }, }, macosx = { + ["3.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-mimalloc/releases/download/3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + }, + sha256 = "e4b8104f9d34fee85c0e49fc4b2c291bc57db558b5c9b38c063cfa87a24a486d", + }, ["3.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1/mimalloc-m-3.6.1.tar.gz", @@ -38,6 +56,13 @@ package = { }, }, windows = { + ["3.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-mimalloc/releases/download/3.6.1.1/mimalloc-m-3.6.1.1.tar.gz", + }, + sha256 = "e4b8104f9d34fee85c0e49fc4b2c291bc57db558b5c9b38c063cfa87a24a486d", + }, ["3.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/mimalloc-m/releases/download/mwrap-3.6.1/mimalloc-m-3.6.1.tar.gz", diff --git a/pkgs/mwrap/miniaudio.lua b/pkgs/mwrap/miniaudio.lua index 79c6fa11..67335288 100644 --- a/pkgs/mwrap/miniaudio.lua +++ b/pkgs/mwrap/miniaudio.lua @@ -7,6 +7,10 @@ -- statically: the package deploys miniaudio's README and LICENSE beside -- programs (runtime.deploy). The wrapper's own CI covers Linux, macOS, Windows -- and the Web (wasm32-emscripten, tests under node). +-- +-- 0.11.25.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.miniaudio = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -23,6 +27,13 @@ package = { }, xpm = { linux = { + ["0.11.25.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-miniaudio/releases/download/0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + }, + sha256 = "33eb231cf18728cf64d9a901ccbd0148f184fbc57c71edea8908b505537a9215", + }, ["0.11.25"] = { url = { GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25/miniaudio-m-0.11.25.tar.gz", @@ -32,6 +43,13 @@ package = { }, }, macosx = { + ["0.11.25.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-miniaudio/releases/download/0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + }, + sha256 = "33eb231cf18728cf64d9a901ccbd0148f184fbc57c71edea8908b505537a9215", + }, ["0.11.25"] = { url = { GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25/miniaudio-m-0.11.25.tar.gz", @@ -41,6 +59,13 @@ package = { }, }, windows = { + ["0.11.25.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-miniaudio/releases/download/0.11.25.1/miniaudio-m-0.11.25.1.tar.gz", + }, + sha256 = "33eb231cf18728cf64d9a901ccbd0148f184fbc57c71edea8908b505537a9215", + }, ["0.11.25"] = { url = { GLOBAL = "https://github.com/mcpplibs/miniaudio-m/releases/download/mwrap-0.11.25/miniaudio-m-0.11.25.tar.gz", diff --git a/pkgs/mwrap/opus.lua b/pkgs/mwrap/opus.lua index 4a734ea1..7187a34b 100644 --- a/pkgs/mwrap/opus.lua +++ b/pkgs/mwrap/opus.lua @@ -6,6 +6,10 @@ -- compat.ogg (libogg 1.3.6). The package deploys each one's README and COPYING -- (libopus's with its royalty-free patent license references) beside programs -- (runtime.deploy). +-- +-- 1.6.1.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.opus = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -22,6 +26,13 @@ package = { }, xpm = { linux = { + ["1.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1.1/opus-m-1.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-opus/releases/download/1.6.1.1/opus-m-1.6.1.1.tar.gz", + }, + sha256 = "4683ce7c1224018c0963afcf90f188192aa71ad8983a216a34ba55b04b1cac38", + }, ["1.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1/opus-m-1.6.1.tar.gz", @@ -31,6 +42,13 @@ package = { }, }, macosx = { + ["1.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1.1/opus-m-1.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-opus/releases/download/1.6.1.1/opus-m-1.6.1.1.tar.gz", + }, + sha256 = "4683ce7c1224018c0963afcf90f188192aa71ad8983a216a34ba55b04b1cac38", + }, ["1.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1/opus-m-1.6.1.tar.gz", @@ -40,6 +58,13 @@ package = { }, }, windows = { + ["1.6.1.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1.1/opus-m-1.6.1.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-opus/releases/download/1.6.1.1/opus-m-1.6.1.1.tar.gz", + }, + sha256 = "4683ce7c1224018c0963afcf90f188192aa71ad8983a216a34ba55b04b1cac38", + }, ["1.6.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/opus-m/releases/download/mwrap-1.6.1/opus-m-1.6.1.tar.gz", diff --git a/pkgs/mwrap/pocketpy.lua b/pkgs/mwrap/pocketpy.lua index 92f21225..b06250de 100644 --- a/pkgs/mwrap/pocketpy.lua +++ b/pkgs/mwrap/pocketpy.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (pocketpy-m mwrap-2.2.0). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 2.2.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.pocketpy = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["2.2.0.1"] = { + url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0.1/pocketpy-m-2.2.0.1.tar.gz", + sha256 = "8b61df9f4b4802d6d4b4ce9d775ef4cb7af2029b28d9c57f0ad519e54fba2ddb", + }, ["2.2.0"] = { url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0/pocketpy-m-2.2.0.tar.gz", sha256 = "bcc3174ff442f9337652d14fdb8da19a6c406e36bc4ffbd3a5afc98035135024", }, }, macosx = { + ["2.2.0.1"] = { + url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0.1/pocketpy-m-2.2.0.1.tar.gz", + sha256 = "8b61df9f4b4802d6d4b4ce9d775ef4cb7af2029b28d9c57f0ad519e54fba2ddb", + }, ["2.2.0"] = { url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0/pocketpy-m-2.2.0.tar.gz", sha256 = "bcc3174ff442f9337652d14fdb8da19a6c406e36bc4ffbd3a5afc98035135024", }, }, windows = { + ["2.2.0.1"] = { + url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0.1/pocketpy-m-2.2.0.1.tar.gz", + sha256 = "8b61df9f4b4802d6d4b4ce9d775ef4cb7af2029b28d9c57f0ad519e54fba2ddb", + }, ["2.2.0"] = { url = "https://github.com/mcpplibs/pocketpy-m/releases/download/mwrap-2.2.0/pocketpy-m-2.2.0.tar.gz", sha256 = "bcc3174ff442f9337652d14fdb8da19a6c406e36bc4ffbd3a5afc98035135024", diff --git a/pkgs/mwrap/quickjs_ng.lua b/pkgs/mwrap/quickjs_ng.lua index fcd4d2c7..772d3e7b 100644 --- a/pkgs/mwrap/quickjs_ng.lua +++ b/pkgs/mwrap/quickjs_ng.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (quickjs-ng-m mwrap-0.17.0). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 0.17.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.quickjs_ng = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["0.17.0.1"] = { + url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0.1/quickjs-ng-m-0.17.0.1.tar.gz", + sha256 = "0fb3b4e399c5796dee6beaa91fd0bbd9bea9384945b6502fe96cfd280fe4a362", + }, ["0.17.0"] = { url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0/quickjs-ng-m-0.17.0.tar.gz", sha256 = "33d95449080f2634611101b24afbb7d996c462fb3939698b76d10c0f7c87aca9", }, }, macosx = { + ["0.17.0.1"] = { + url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0.1/quickjs-ng-m-0.17.0.1.tar.gz", + sha256 = "0fb3b4e399c5796dee6beaa91fd0bbd9bea9384945b6502fe96cfd280fe4a362", + }, ["0.17.0"] = { url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0/quickjs-ng-m-0.17.0.tar.gz", sha256 = "33d95449080f2634611101b24afbb7d996c462fb3939698b76d10c0f7c87aca9", }, }, windows = { + ["0.17.0.1"] = { + url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0.1/quickjs-ng-m-0.17.0.1.tar.gz", + sha256 = "0fb3b4e399c5796dee6beaa91fd0bbd9bea9384945b6502fe96cfd280fe4a362", + }, ["0.17.0"] = { url = "https://github.com/mcpplibs/quickjs-ng-m/releases/download/mwrap-0.17.0/quickjs-ng-m-0.17.0.tar.gz", sha256 = "33d95449080f2634611101b24afbb7d996c462fb3939698b76d10c0f7c87aca9", diff --git a/pkgs/mwrap/sdl3.lua b/pkgs/mwrap/sdl3.lua index bc129091..30f19930 100644 --- a/pkgs/mwrap/sdl3.lua +++ b/pkgs/mwrap/sdl3.lua @@ -1,6 +1,10 @@ -- Immutable upstream-aligned mwrap source release (sdl3-m mwrap-3.4.18). -- The CN mirror is added by a maintainer with mcpp-res access; until then CN -- users fall back to the GitHub release (docs/cn-mirror.md). +-- +-- 3.4.18.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.sdl3 = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -17,18 +21,30 @@ package = { }, xpm = { linux = { + ["3.4.18.1"] = { + url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18.1/sdl3-m-3.4.18.1.tar.gz", + sha256 = "2a9a3e0182dad0a5718ddbff087a012ddf969e50c04cda1f1f7092d381ac44d5", + }, ["3.4.18"] = { url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18/sdl3-m-3.4.18.tar.gz", sha256 = "e056750efe3bdb9e03457cb202d7a17f9c942630637656f382ac0604d8a66d08", }, }, macosx = { + ["3.4.18.1"] = { + url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18.1/sdl3-m-3.4.18.1.tar.gz", + sha256 = "2a9a3e0182dad0a5718ddbff087a012ddf969e50c04cda1f1f7092d381ac44d5", + }, ["3.4.18"] = { url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18/sdl3-m-3.4.18.tar.gz", sha256 = "e056750efe3bdb9e03457cb202d7a17f9c942630637656f382ac0604d8a66d08", }, }, windows = { + ["3.4.18.1"] = { + url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18.1/sdl3-m-3.4.18.1.tar.gz", + sha256 = "2a9a3e0182dad0a5718ddbff087a012ddf969e50c04cda1f1f7092d381ac44d5", + }, ["3.4.18"] = { url = "https://github.com/mcpplibs/sdl3-m/releases/download/mwrap-3.4.18/sdl3-m-3.4.18.tar.gz", sha256 = "e056750efe3bdb9e03457cb202d7a17f9c942630637656f382ac0604d8a66d08", diff --git a/pkgs/mwrap/sheenbidi.lua b/pkgs/mwrap/sheenbidi.lua index 4165c10c..ded5a380 100644 --- a/pkgs/mwrap/sheenbidi.lua +++ b/pkgs/mwrap/sheenbidi.lua @@ -5,6 +5,10 @@ -- (SheenBidi 3.0.0, Unicode 17.0.0), linked statically: the package deploys -- SheenBidi's README and LICENSE and the Unicode License v3 of the data its -- tables come from beside programs (runtime.deploy). +-- +-- 3.0.0.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.sheenbidi = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -21,6 +25,13 @@ package = { }, xpm = { linux = { + ["3.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-sheenbidi/releases/download/3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + }, + sha256 = "5f99e10511b1a4c35b63d6bf22175d4b9b6cc7602f144e42b7714586de92ac81", + }, ["3.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0/sheenbidi-m-3.0.0.tar.gz", @@ -30,6 +41,13 @@ package = { }, }, macosx = { + ["3.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-sheenbidi/releases/download/3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + }, + sha256 = "5f99e10511b1a4c35b63d6bf22175d4b9b6cc7602f144e42b7714586de92ac81", + }, ["3.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0/sheenbidi-m-3.0.0.tar.gz", @@ -39,6 +57,13 @@ package = { }, }, windows = { + ["3.0.0.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-sheenbidi/releases/download/3.0.0.1/sheenbidi-m-3.0.0.1.tar.gz", + }, + sha256 = "5f99e10511b1a4c35b63d6bf22175d4b9b6cc7602f144e42b7714586de92ac81", + }, ["3.0.0"] = { url = { GLOBAL = "https://github.com/mcpplibs/sheenbidi-m/releases/download/mwrap-3.0.0/sheenbidi-m-3.0.0.tar.gz", diff --git a/pkgs/mwrap/xxhash.lua b/pkgs/mwrap/xxhash.lua index 2a69f114..c1cbbf7e 100644 --- a/pkgs/mwrap/xxhash.lua +++ b/pkgs/mwrap/xxhash.lua @@ -4,6 +4,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.xxhash (xxHash -- 0.8.3), is BSD-2-Clause, linked statically: the package deploys its README -- and LICENSE beside programs (runtime.deploy). +-- +-- 0.8.3.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.xxhash = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -20,6 +24,13 @@ package = { }, xpm = { linux = { + ["0.8.3.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xxhash/releases/download/0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + }, + sha256 = "f287c25593af9e56aa7ad9682c3c0626339a05be249c53e4987d0566b3f7b260", + }, ["0.8.3"] = { url = { GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3/xxhash-m-0.8.3.tar.gz", @@ -29,6 +40,13 @@ package = { }, }, macosx = { + ["0.8.3.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xxhash/releases/download/0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + }, + sha256 = "f287c25593af9e56aa7ad9682c3c0626339a05be249c53e4987d0566b3f7b260", + }, ["0.8.3"] = { url = { GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3/xxhash-m-0.8.3.tar.gz", @@ -38,6 +56,13 @@ package = { }, }, windows = { + ["0.8.3.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xxhash/releases/download/0.8.3.1/xxhash-m-0.8.3.1.tar.gz", + }, + sha256 = "f287c25593af9e56aa7ad9682c3c0626339a05be249c53e4987d0566b3f7b260", + }, ["0.8.3"] = { url = { GLOBAL = "https://github.com/mcpplibs/xxhash-m/releases/download/mwrap-0.8.3/xxhash-m-0.8.3.tar.gz", diff --git a/pkgs/mwrap/xz.lua b/pkgs/mwrap/xz.lua index 27c87860..e76ce52a 100644 --- a/pkgs/mwrap/xz.lua +++ b/pkgs/mwrap/xz.lua @@ -9,6 +9,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.xz (liblzma of XZ -- Utils 5.8.3), is 0BSD, linked statically: the package deploys its README and -- licenses beside programs (runtime.deploy). +-- +-- 5.8.3.2 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.xz = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -25,6 +29,13 @@ package = { }, xpm = { linux = { + ["5.8.3.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.2/xz-m-5.8.3.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xz/releases/download/5.8.3.2/xz-m-5.8.3.2.tar.gz", + }, + sha256 = "a83d709732fe1a225dacbdd39faaa0856f2801c516adedd9a3c0daf1c46420ad", + }, ["5.8.3.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.1/xz-m-5.8.3.1.tar.gz", @@ -41,6 +52,13 @@ package = { }, }, macosx = { + ["5.8.3.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.2/xz-m-5.8.3.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xz/releases/download/5.8.3.2/xz-m-5.8.3.2.tar.gz", + }, + sha256 = "a83d709732fe1a225dacbdd39faaa0856f2801c516adedd9a3c0daf1c46420ad", + }, ["5.8.3.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.1/xz-m-5.8.3.1.tar.gz", @@ -57,6 +75,13 @@ package = { }, }, windows = { + ["5.8.3.2"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.2/xz-m-5.8.3.2.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-xz/releases/download/5.8.3.2/xz-m-5.8.3.2.tar.gz", + }, + sha256 = "a83d709732fe1a225dacbdd39faaa0856f2801c516adedd9a3c0daf1c46420ad", + }, ["5.8.3.1"] = { url = { GLOBAL = "https://github.com/mcpplibs/xz-m/releases/download/mwrap-5.8.3.1/xz-m-5.8.3.1.tar.gz", diff --git a/pkgs/mwrap/zlib.lua b/pkgs/mwrap/zlib.lua index 2a82e00b..58d94647 100644 --- a/pkgs/mwrap/zlib.lua +++ b/pkgs/mwrap/zlib.lua @@ -4,6 +4,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.zlib (zlib 1.3.2), is -- under the zlib license, linked statically: the package deploys zlib's README -- and LICENSE beside programs (runtime.deploy). +-- +-- 1.3.2.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.zlib = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -20,6 +24,13 @@ package = { }, xpm = { linux = { + ["1.3.2.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2.1/zlib-m-1.3.2.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zlib/releases/download/1.3.2.1/zlib-m-1.3.2.1.tar.gz", + }, + sha256 = "246a4cfc9027b210ae783cb27a78101704decf30505b606e4f2ba0e1243e64c8", + }, ["1.3.2"] = { url = { GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2/zlib-m-1.3.2.tar.gz", @@ -29,6 +40,13 @@ package = { }, }, macosx = { + ["1.3.2.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2.1/zlib-m-1.3.2.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zlib/releases/download/1.3.2.1/zlib-m-1.3.2.1.tar.gz", + }, + sha256 = "246a4cfc9027b210ae783cb27a78101704decf30505b606e4f2ba0e1243e64c8", + }, ["1.3.2"] = { url = { GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2/zlib-m-1.3.2.tar.gz", @@ -38,6 +56,13 @@ package = { }, }, windows = { + ["1.3.2.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2.1/zlib-m-1.3.2.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zlib/releases/download/1.3.2.1/zlib-m-1.3.2.1.tar.gz", + }, + sha256 = "246a4cfc9027b210ae783cb27a78101704decf30505b606e4f2ba0e1243e64c8", + }, ["1.3.2"] = { url = { GLOBAL = "https://github.com/mcpplibs/zlib-m/releases/download/mwrap-1.3.2/zlib-m-1.3.2.tar.gz", diff --git a/pkgs/mwrap/zstd.lua b/pkgs/mwrap/zstd.lua index 935a1f0f..84efa6c0 100644 --- a/pkgs/mwrap/zstd.lua +++ b/pkgs/mwrap/zstd.lua @@ -4,6 +4,10 @@ -- The wrapper is Apache-2.0; the library it links, compat.zstd (Zstandard -- 1.5.7), is under the BSD license or the GPLv2, linked statically: the package -- deploys its README and both licenses beside programs (runtime.deploy). +-- +-- 1.5.7.1 is a wrapper revision: its templates write the dependency selector +-- unquoted (`mcpplibs.mwrap.zstd = ...`); the quoted form is deprecated +-- since mcpp 2026.11.8.1 and removed in 2027.2. package = { spec = "1", namespace = "mcpplibs.mwrap", @@ -20,6 +24,13 @@ package = { }, xpm = { linux = { + ["1.5.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7.1/zstd-m-1.5.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zstd/releases/download/1.5.7.1/zstd-m-1.5.7.1.tar.gz", + }, + sha256 = "654e7be287b02467cfa1c8d303204005bf0695ffa4fe3c2c9b436794a359c5e9", + }, ["1.5.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7/zstd-m-1.5.7.tar.gz", @@ -29,6 +40,13 @@ package = { }, }, macosx = { + ["1.5.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7.1/zstd-m-1.5.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zstd/releases/download/1.5.7.1/zstd-m-1.5.7.1.tar.gz", + }, + sha256 = "654e7be287b02467cfa1c8d303204005bf0695ffa4fe3c2c9b436794a359c5e9", + }, ["1.5.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7/zstd-m-1.5.7.tar.gz", @@ -38,6 +56,13 @@ package = { }, }, windows = { + ["1.5.7.1"] = { + url = { + GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7.1/zstd-m-1.5.7.1.tar.gz", + CN = "https://gitcode.com/mcpp-res/mwrap-zstd/releases/download/1.5.7.1/zstd-m-1.5.7.1.tar.gz", + }, + sha256 = "654e7be287b02467cfa1c8d303204005bf0695ffa4fe3c2c9b436794a359c5e9", + }, ["1.5.7"] = { url = { GLOBAL = "https://github.com/mcpplibs/zstd-m/releases/download/mwrap-1.5.7/zstd-m-1.5.7.tar.gz", diff --git a/pkgs/t/taskflow.taskflow.lua b/pkgs/t/taskflow.taskflow.lua index 4bc9f5a8..079fa5f6 100644 --- a/pkgs/t/taskflow.taskflow.lua +++ b/pkgs/t/taskflow.taskflow.lua @@ -19,18 +19,24 @@ package = { ["4.1.0"] = { url = "https://github.com/taskflow/taskflow/archive/refs/tags/v4.1.0.tar.gz", sha256 = "2107f90e315e48a676922010b036357ff2b0c6b9160ce17fa9396e5860b1d715", + -- 1: tfprof.hpp's two namespace-scope helpers are inline, not static inline (install()). + revision = 1, }, }, macosx = { ["4.1.0"] = { url = "https://github.com/taskflow/taskflow/archive/refs/tags/v4.1.0.tar.gz", sha256 = "2107f90e315e48a676922010b036357ff2b0c6b9160ce17fa9396e5860b1d715", + -- 1: tfprof.hpp's two namespace-scope helpers are inline, not static inline (install()). + revision = 1, }, }, windows = { ["4.1.0"] = { url = "https://github.com/taskflow/taskflow/archive/refs/tags/v4.1.0.tar.gz", sha256 = "2107f90e315e48a676922010b036357ff2b0c6b9160ce17fa9396e5860b1d715", + -- 1: tfprof.hpp's two namespace-scope helpers are inline, not static inline (install()). + revision = 1, }, }, }, @@ -85,6 +91,13 @@ function install() -- iterator.hpp 使用 std::max,但 libc++ 的间接包含不提供它 patch("modules/tf.utility.cppm", "module;\n", "module;\n#include \n") + -- tfprof.hpp 的两个命名空间作用域辅助函数为 `static inline`::core 与 :algorithm 两个分区的 + -- 全局模块片段各包含一次,导入 tf 的翻译单元因而见到两个内部链接的定义。MSVC ABI 下二者的 + -- 修饰名相同,clang 23 报 "definition with same mangled name"(windows-x86_64,llvm@23.1.3); + -- 改为 `inline`(外部链接)后两处是同一实体 + patch("taskflow/observer/tfprof.hpp", "static inline void _tf_rule(", "inline void _tf_rule(") + patch("taskflow/observer/tfprof.hpp", "static inline double _tf_time_scale(", "inline double _tf_time_scale(") + local prefix = pkginfo.install_dir() os.tryrm(prefix) os.mkdir(prefix) diff --git a/tests/examples/abseil/mcpp.toml b/tests/examples/abseil/mcpp.toml index 99131ee2..cd775ff5 100644 --- a/tests/examples/abseil/mcpp.toml +++ b/tests/examples/abseil/mcpp.toml @@ -14,3 +14,7 @@ version = "0.1.0" [dependencies.compat] abseil = "20250512.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/accesskit/mcpp.toml b/tests/examples/accesskit/mcpp.toml index 28238504..28449da7 100644 --- a/tests/examples/accesskit/mcpp.toml +++ b/tests/examples/accesskit/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] accesskit = "0.23.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/apriltag/mcpp.toml b/tests/examples/apriltag/mcpp.toml index e068b374..c275bec0 100644 --- a/tests/examples/apriltag/mcpp.toml +++ b/tests/examples/apriltag/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] apriltag = "3.4.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/archive/mcpp.toml b/tests/examples/archive/mcpp.toml index 4866c3b6..d75fd7fc 100644 --- a/tests/examples/archive/mcpp.toml +++ b/tests/examples/archive/mcpp.toml @@ -11,3 +11,7 @@ bzip2 = "1.0.8" lz4 = "1.10.0" xz = "5.8.3" zstd = "1.5.7" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/argparse/mcpp.toml b/tests/examples/argparse/mcpp.toml index fdb82e24..a42146cd 100644 --- a/tests/examples/argparse/mcpp.toml +++ b/tests/examples/argparse/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] argparse = "3.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/asio-ssl/mcpp.toml b/tests/examples/asio-ssl/mcpp.toml index 929c7aaa..39028485 100644 --- a/tests/examples/asio-ssl/mcpp.toml +++ b/tests/examples/asio-ssl/mcpp.toml @@ -45,3 +45,7 @@ asio = { version = "1.38.1", features = ["ssl"] } [target.'cfg(windows)'.build] cxxflags = ["-DHAVE_ASIO_SSL=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-any/mcpp.toml b/tests/examples/boost-any/mcpp.toml index 2b3e809e..8bb68efd 100644 --- a/tests/examples/boost-any/mcpp.toml +++ b/tests/examples/boost-any/mcpp.toml @@ -5,3 +5,7 @@ version = "0.1.0" [dependencies.compat] boost-any = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-asio/mcpp.toml b/tests/examples/boost-asio/mcpp.toml index b6908f70..4fea6a9a 100644 --- a/tests/examples/boost-asio/mcpp.toml +++ b/tests/examples/boost-asio/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [dependencies.compat] boost-asio = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-assert/mcpp.toml b/tests/examples/boost-assert/mcpp.toml index ce0c83d1..7ba901f8 100644 --- a/tests/examples/boost-assert/mcpp.toml +++ b/tests/examples/boost-assert/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] boost-assert = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-beast/mcpp.toml b/tests/examples/boost-beast/mcpp.toml index b02373df..cf398157 100644 --- a/tests/examples/boost-beast/mcpp.toml +++ b/tests/examples/boost-beast/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] boost-beast = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-circular-buffer/mcpp.toml b/tests/examples/boost-circular-buffer/mcpp.toml index 9df93b78..6900082e 100644 --- a/tests/examples/boost-circular-buffer/mcpp.toml +++ b/tests/examples/boost-circular-buffer/mcpp.toml @@ -5,3 +5,7 @@ version = "0.1.0" [dependencies.compat] boost-circular-buffer = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-concept-check/mcpp.toml b/tests/examples/boost-concept-check/mcpp.toml index 2a4cc8e6..2dc1357c 100644 --- a/tests/examples/boost-concept-check/mcpp.toml +++ b/tests/examples/boost-concept-check/mcpp.toml @@ -5,3 +5,7 @@ version = "0.1.0" [dependencies.compat] boost-concept-check = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-config/mcpp.toml b/tests/examples/boost-config/mcpp.toml index b4ee2933..fcd7d7ee 100644 --- a/tests/examples/boost-config/mcpp.toml +++ b/tests/examples/boost-config/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] boost-config = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-family/mcpp.toml b/tests/examples/boost-family/mcpp.toml index eeb19873..488092f1 100644 --- a/tests/examples/boost-family/mcpp.toml +++ b/tests/examples/boost-family/mcpp.toml @@ -30,3 +30,7 @@ boost-type-index = "1.92.0" boost-utility = "1.92.0" boost-variant2 = "1.92.0" boost-winapi = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-throw-exception/mcpp.toml b/tests/examples/boost-throw-exception/mcpp.toml index 4bc5c3a8..602c935c 100644 --- a/tests/examples/boost-throw-exception/mcpp.toml +++ b/tests/examples/boost-throw-exception/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] boost-throw-exception = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-type-traits/mcpp.toml b/tests/examples/boost-type-traits/mcpp.toml index dd810c2a..a8c8b66a 100644 --- a/tests/examples/boost-type-traits/mcpp.toml +++ b/tests/examples/boost-type-traits/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] boost-type-traits = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/boost-uuid/mcpp.toml b/tests/examples/boost-uuid/mcpp.toml index 51012074..bf10f446 100644 --- a/tests/examples/boost-uuid/mcpp.toml +++ b/tests/examples/boost-uuid/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] boost-uuid = "1.92.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/box2d/mcpp.toml b/tests/examples/box2d/mcpp.toml index bb022940..a4f19b67 100644 --- a/tests/examples/box2d/mcpp.toml +++ b/tests/examples/box2d/mcpp.toml @@ -14,3 +14,7 @@ cxxflags = ["-ffp-contract=off"] [dependencies] compat.box2d = "3.2.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/brotli/mcpp.toml b/tests/examples/brotli/mcpp.toml index 792e872c..4562f83b 100644 --- a/tests/examples/brotli/mcpp.toml +++ b/tests/examples/brotli/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] brotli = "1.2.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/build-mcpp/mcpp.toml b/tests/examples/build-mcpp/mcpp.toml index 8442cef5..94f94476 100644 --- a/tests/examples/build-mcpp/mcpp.toml +++ b/tests/examples/build-mcpp/mcpp.toml @@ -4,3 +4,7 @@ [package] name = "build-mcpp-tests" version = "0.1.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/c-ares/mcpp.toml b/tests/examples/c-ares/mcpp.toml index 090b66f3..97ea6351 100644 --- a/tests/examples/c-ares/mcpp.toml +++ b/tests/examples/c-ares/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] c-ares = "1.34.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/catch2-main/mcpp.toml b/tests/examples/catch2-main/mcpp.toml index 6a2459da..740c9123 100644 --- a/tests/examples/catch2-main/mcpp.toml +++ b/tests/examples/catch2-main/mcpp.toml @@ -14,3 +14,7 @@ version = "0.1.0" [dependencies.compat] catch2 = { version = "3.15.2", features = ["main"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/catch2-v2-main/mcpp.toml b/tests/examples/catch2-v2-main/mcpp.toml index 75fe50eb..f56ad8d4 100644 --- a/tests/examples/catch2-v2-main/mcpp.toml +++ b/tests/examples/catch2-v2-main/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] catch2 = { version = "2.13.10", features = ["main"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/catch2-v2/mcpp.toml b/tests/examples/catch2-v2/mcpp.toml index f01d4dae..082fdede 100644 --- a/tests/examples/catch2-v2/mcpp.toml +++ b/tests/examples/catch2-v2/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] catch2 = "2.13.10" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/catch2/mcpp.toml b/tests/examples/catch2/mcpp.toml index 8f0643c0..677e7dd1 100644 --- a/tests/examples/catch2/mcpp.toml +++ b/tests/examples/catch2/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] catch2 = "3.15.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/cjson/mcpp.toml b/tests/examples/cjson/mcpp.toml index d32122ce..7b7724af 100644 --- a/tests/examples/cjson/mcpp.toml +++ b/tests/examples/cjson/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] cjson = "1.7.19" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/cli11/mcpp.toml b/tests/examples/cli11/mcpp.toml index 1ddacfc7..afcbbdbf 100644 --- a/tests/examples/cli11/mcpp.toml +++ b/tests/examples/cli11/mcpp.toml @@ -15,3 +15,7 @@ version = "0.1.0" [dependencies.compat] CLI11 = "2.7.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/concurrentqueue-c-api/mcpp.toml b/tests/examples/concurrentqueue-c-api/mcpp.toml index ffccad13..71942c2f 100644 --- a/tests/examples/concurrentqueue-c-api/mcpp.toml +++ b/tests/examples/concurrentqueue-c-api/mcpp.toml @@ -13,3 +13,7 @@ version = "0.1.0" [dependencies.compat] concurrentqueue = { version = "1.0.5", features = ["c-api"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/concurrentqueue/mcpp.toml b/tests/examples/concurrentqueue/mcpp.toml index d65ddd24..3b6a89e3 100644 --- a/tests/examples/concurrentqueue/mcpp.toml +++ b/tests/examples/concurrentqueue/mcpp.toml @@ -16,3 +16,7 @@ version = "0.1.0" [dependencies.compat] concurrentqueue = "1.0.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/core/mcpp.toml b/tests/examples/core/mcpp.toml index bfd19c61..d0bdb6c4 100644 --- a/tests/examples/core/mcpp.toml +++ b/tests/examples/core/mcpp.toml @@ -18,3 +18,7 @@ khrplatform = "2026.05.31" ldflags = ["-ldl", "-lm"] [target.'cfg(macos)'.build] ldflags = ["-lm"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/cpptrace/mcpp.toml b/tests/examples/cpptrace/mcpp.toml index 7fddfb27..3c7b42d1 100644 --- a/tests/examples/cpptrace/mcpp.toml +++ b/tests/examples/cpptrace/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] cpptrace = "1.0.4" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/cpptrace/tests/trace.cpp b/tests/examples/cpptrace/tests/trace.cpp index fabecce9..687f8f8e 100644 --- a/tests/examples/cpptrace/tests/trace.cpp +++ b/tests/examples/cpptrace/tests/trace.cpp @@ -19,17 +19,17 @@ // The package builds objects, not a shared library, so every cpptrace // declaration this TU sees must be plain — not dllimport, not -// visibility("default"). The package delivers that with a shim in front of -// cpptrace/basic.hpp, because no descriptor key carries a define to a +// visibility("default"). The package states CPPTRACE_STATIC_DEFINE as a +// `staticlib` feature that `default` implies; a feature's defines reach the // consumer's TUs. // // This check exists because the failure it guards is invisible on Linux: there // the difference is only a visibility attribute and everything still links. On // the MSVC ABI it is `dllimport` versus nothing, and the link fails with // "undefined symbol: __declspec(dllimport) ...". Asserting the macro at COMPILE -// time fails on every platform the moment the shim stops being reached. +// time fails on every platform the moment the define stops being delivered. #if !defined(CPPTRACE_STATIC_DEFINE) -# error "CPPTRACE_STATIC_DEFINE is not set for this consumer TU — the compat.cpptrace basic.hpp shim was not reached (include_dirs order?)" +# error "CPPTRACE_STATIC_DEFINE is not set for this consumer TU — compat.cpptrace's staticlib feature did not reach it" #endif // noinline so the three frames cannot be collapsed into one by the optimiser; diff --git a/tests/examples/cuda-curand/mcpp.toml b/tests/examples/cuda-curand/mcpp.toml index 30d9a339..7711f80a 100644 --- a/tests/examples/cuda-curand/mcpp.toml +++ b/tests/examples/cuda-curand/mcpp.toml @@ -30,3 +30,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] curand = "10.3.10.19" cuda-driver = "2026.09.05" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/cuda-driver/mcpp.toml b/tests/examples/cuda-driver/mcpp.toml index 79f9af6c..fa758a55 100644 --- a/tests/examples/cuda-driver/mcpp.toml +++ b/tests/examples/cuda-driver/mcpp.toml @@ -18,3 +18,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] cuda-driver = "2026.09.05" cuda-runtime = "2026.09.05" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/curl/mcpp.toml b/tests/examples/curl/mcpp.toml index 12fb073b..5865d978 100644 --- a/tests/examples/curl/mcpp.toml +++ b/tests/examples/curl/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" # fails — which is the point of not spelling it out on this side. [dependencies.compat] curl = "8.21.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/doctest/mcpp.toml b/tests/examples/doctest/mcpp.toml index b72298b3..9611288e 100644 --- a/tests/examples/doctest/mcpp.toml +++ b/tests/examples/doctest/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] doctest = "2.4.12" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/dr_libs/mcpp.toml b/tests/examples/dr_libs/mcpp.toml index 58b1a84e..7945d3fe 100644 --- a/tests/examples/dr_libs/mcpp.toml +++ b/tests/examples/dr_libs/mcpp.toml @@ -9,3 +9,7 @@ standard = "c++23" [dependencies] compat.dr_libs = "2026.03.03" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eigen/mcpp.toml b/tests/examples/eigen/mcpp.toml index 5ae0f413..953f9dfc 100644 --- a/tests/examples/eigen/mcpp.toml +++ b/tests/examples/eigen/mcpp.toml @@ -16,3 +16,7 @@ version = "0.1.0" [dependencies.compat] eigen = "5.0.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-app-main/mcpp.toml b/tests/examples/eui-neo-app-main/mcpp.toml index 48825807..9187eeb9 100644 --- a/tests/examples/eui-neo-app-main/mcpp.toml +++ b/tests/examples/eui-neo-app-main/mcpp.toml @@ -31,3 +31,7 @@ version = "0.1.0" [dependencies.compat] eui-neo = { version = "0.6.3", features = ["app-main"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-markdown/mcpp.toml b/tests/examples/eui-neo-markdown/mcpp.toml index 5d99f3d5..5a11d25b 100644 --- a/tests/examples/eui-neo-markdown/mcpp.toml +++ b/tests/examples/eui-neo-markdown/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] eui-neo = { version = "0.6.3", features = ["markdown"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-sdl2/mcpp.toml b/tests/examples/eui-neo-sdl2/mcpp.toml index 1fe5bcf8..7bc45b8f 100644 --- a/tests/examples/eui-neo-sdl2/mcpp.toml +++ b/tests/examples/eui-neo-sdl2/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" # unnamed — naming a feature no longer costs you the defaults. [dependencies.compat] eui-neo = { version = "0.6.3", features = ["sdl2", "network"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-serial/mcpp.toml b/tests/examples/eui-neo-serial/mcpp.toml index 8189a759..ce147d7c 100644 --- a/tests/examples/eui-neo-serial/mcpp.toml +++ b/tests/examples/eui-neo-serial/mcpp.toml @@ -16,3 +16,7 @@ version = "0.1.0" # The `compat` index redirect is inherited from the workspace root. [dependencies.compat] eui-neo = { version = "0.6.3", features = ["serial"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-tray/mcpp.toml b/tests/examples/eui-neo-tray/mcpp.toml index f1cc4fdc..80cd463b 100644 --- a/tests/examples/eui-neo-tray/mcpp.toml +++ b/tests/examples/eui-neo-tray/mcpp.toml @@ -26,3 +26,7 @@ version = "0.1.0" [dependencies.compat] eui-neo = "0.6.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-vulkan/mcpp.toml b/tests/examples/eui-neo-vulkan/mcpp.toml index 45161f0b..5e3093e8 100644 --- a/tests/examples/eui-neo-vulkan/mcpp.toml +++ b/tests/examples/eui-neo-vulkan/mcpp.toml @@ -10,3 +10,7 @@ eui-neo = { version = "0.6.3", features = ["vulkan"] } [build] cxxflags = ["-DHAVE_EUI_VULKAN=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo-window/mcpp.toml b/tests/examples/eui-neo-window/mcpp.toml index a44a0dfa..62852acc 100644 --- a/tests/examples/eui-neo-window/mcpp.toml +++ b/tests/examples/eui-neo-window/mcpp.toml @@ -35,3 +35,7 @@ version = "0.1.0" [dependencies.compat] eui-neo = "0.6.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/eui-neo/mcpp.toml b/tests/examples/eui-neo/mcpp.toml index f040f91c..3af27378 100644 --- a/tests/examples/eui-neo/mcpp.toml +++ b/tests/examples/eui-neo/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] eui-neo = "0.6.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/expat/mcpp.toml b/tests/examples/expat/mcpp.toml index e89d301b..1b8955a2 100644 --- a/tests/examples/expat/mcpp.toml +++ b/tests/examples/expat/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] expat = "2.7.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/ffmpeg/mcpp.toml b/tests/examples/ffmpeg/mcpp.toml index fbd406a0..d2606cf6 100644 --- a/tests/examples/ffmpeg/mcpp.toml +++ b/tests/examples/ffmpeg/mcpp.toml @@ -16,3 +16,7 @@ ffmpeg = "8.1.2" [target.'cfg(windows)'.dependencies.compat] ffmpeg = "8.1.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/freetype/mcpp.toml b/tests/examples/freetype/mcpp.toml index 34241f6a..ad5d36e0 100644 --- a/tests/examples/freetype/mcpp.toml +++ b/tests/examples/freetype/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] freetype = "2.13.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/ftxui-module/mcpp.toml b/tests/examples/ftxui-module/mcpp.toml index 09d97e16..123977ad 100644 --- a/tests/examples/ftxui-module/mcpp.toml +++ b/tests/examples/ftxui-module/mcpp.toml @@ -26,3 +26,7 @@ version = "0.1.0" [dependencies.compat] ftxui = { version = "7.0.3", features = ["modules"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/glad/mcpp.toml b/tests/examples/glad/mcpp.toml index d690803e..2ba8a75c 100644 --- a/tests/examples/glad/mcpp.toml +++ b/tests/examples/glad/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] glad = "0.0.0-651a425" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/glm/mcpp.toml b/tests/examples/glm/mcpp.toml index cfebf7e7..57542141 100644 --- a/tests/examples/glm/mcpp.toml +++ b/tests/examples/glm/mcpp.toml @@ -14,3 +14,7 @@ glm = "1.0.2" # OpenGL's -1..1, and the test below asserts exactly that difference. [build] cxxflags = ["-DGLM_FORCE_DEPTH_ZERO_TO_ONE", "-DGLM_ENABLE_EXPERIMENTAL"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/gmp-gmpxx/mcpp.toml b/tests/examples/gmp-gmpxx/mcpp.toml index 2c46c73d..b97dbec9 100644 --- a/tests/examples/gmp-gmpxx/mcpp.toml +++ b/tests/examples/gmp-gmpxx/mcpp.toml @@ -28,3 +28,7 @@ version = "0.1.0" [dependencies.compat] gmp = { version = "6.3.0", features = ["gmpxx"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/gmp/mcpp.toml b/tests/examples/gmp/mcpp.toml index baeb9f8d..d1dc8bf6 100644 --- a/tests/examples/gmp/mcpp.toml +++ b/tests/examples/gmp/mcpp.toml @@ -18,3 +18,7 @@ version = "0.1.0" [dependencies.compat] gmp = "6.3.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/godot-cpp-v10/mcpp.toml b/tests/examples/godot-cpp-v10/mcpp.toml index 12c2e9fa..94ad24ec 100644 --- a/tests/examples/godot-cpp-v10/mcpp.toml +++ b/tests/examples/godot-cpp-v10/mcpp.toml @@ -13,3 +13,7 @@ version = "0.1.0" [dependencies.compat] godot-cpp = "10.0.0-rc1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/godot-cpp/mcpp.toml b/tests/examples/godot-cpp/mcpp.toml index 8b71c3b3..d0e78744 100644 --- a/tests/examples/godot-cpp/mcpp.toml +++ b/tests/examples/godot-cpp/mcpp.toml @@ -13,3 +13,7 @@ version = "0.1.0" [dependencies.compat] godot-cpp = "4.5.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/grpc-codegen/mcpp.toml b/tests/examples/grpc-codegen/mcpp.toml index db817a2c..7f032ade 100644 --- a/tests/examples/grpc-codegen/mcpp.toml +++ b/tests/examples/grpc-codegen/mcpp.toml @@ -44,3 +44,7 @@ cxxflags = ["-DHAVE_GRPC=1"] # is why it is available here while grpc is not. [target.'cfg(windows)'.dependencies.mcpplibs] grpcgen = { version = "1.83.0", host-module = true } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/gtl/mcpp.toml b/tests/examples/gtl/mcpp.toml index 501cee6c..7c2ffaa4 100644 --- a/tests/examples/gtl/mcpp.toml +++ b/tests/examples/gtl/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] gtl = "1.2.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/gui-stack/mcpp.toml b/tests/examples/gui-stack/mcpp.toml index 69ef8b98..b1dbcfe2 100644 --- a/tests/examples/gui-stack/mcpp.toml +++ b/tests/examples/gui-stack/mcpp.toml @@ -19,3 +19,7 @@ xrandr = "1.5.5" xi = "1.8.3" xau = "1.0.12" xdmcp = "1.1.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/gzip-hpp/mcpp.toml b/tests/examples/gzip-hpp/mcpp.toml index b8e1f085..5062194e 100644 --- a/tests/examples/gzip-hpp/mcpp.toml +++ b/tests/examples/gzip-hpp/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] gzip-hpp = "0.1.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/harfbuzz/mcpp.toml b/tests/examples/harfbuzz/mcpp.toml index 3430c3bb..324d43f6 100644 --- a/tests/examples/harfbuzz/mcpp.toml +++ b/tests/examples/harfbuzz/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] harfbuzz = "14.3.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib-brotli/mcpp.toml b/tests/examples/httplib-brotli/mcpp.toml index 97a37b5b..a0c8169e 100644 --- a/tests/examples/httplib-brotli/mcpp.toml +++ b/tests/examples/httplib-brotli/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = { version = "0.62.0", features = ["brotli"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib-no-exceptions/mcpp.toml b/tests/examples/httplib-no-exceptions/mcpp.toml index 9f26b6eb..6a35f691 100644 --- a/tests/examples/httplib-no-exceptions/mcpp.toml +++ b/tests/examples/httplib-no-exceptions/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = { version = "0.62.0", features = ["no-exceptions"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib-tls/mcpp.toml b/tests/examples/httplib-tls/mcpp.toml index 936d0e3f..df59f7e7 100644 --- a/tests/examples/httplib-tls/mcpp.toml +++ b/tests/examples/httplib-tls/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = { version = "0.62.0", features = ["tls"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib-zlib/mcpp.toml b/tests/examples/httplib-zlib/mcpp.toml index 530a9e12..0c615301 100644 --- a/tests/examples/httplib-zlib/mcpp.toml +++ b/tests/examples/httplib-zlib/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = { version = "0.62.0", features = ["zlib"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib-zstd/mcpp.toml b/tests/examples/httplib-zstd/mcpp.toml index fd6b6f9d..95e7823f 100644 --- a/tests/examples/httplib-zstd/mcpp.toml +++ b/tests/examples/httplib-zstd/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = { version = "0.62.0", features = ["zstd"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/httplib/mcpp.toml b/tests/examples/httplib/mcpp.toml index d52151ac..e2443697 100644 --- a/tests/examples/httplib/mcpp.toml +++ b/tests/examples/httplib/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] httplib = "0.62.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/imgui-window/mcpp.toml b/tests/examples/imgui-window/mcpp.toml index fce20a4f..4b25f1f9 100644 --- a/tests/examples/imgui-window/mcpp.toml +++ b/tests/examples/imgui-window/mcpp.toml @@ -10,3 +10,7 @@ imgui = "1.93.0" glfw = "3.4.0.1" [target.'cfg(linux)'.build] ldflags = ["-ldl"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/imgui/mcpp.toml b/tests/examples/imgui/mcpp.toml index 940bd5a1..bf866d2e 100644 --- a/tests/examples/imgui/mcpp.toml +++ b/tests/examples/imgui/mcpp.toml @@ -5,3 +5,7 @@ version = "0.1.0" [dependencies.compat] imgui = "1.93.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/jwt-cpp/mcpp.toml b/tests/examples/jwt-cpp/mcpp.toml index 3a31d908..6343331c 100644 --- a/tests/examples/jwt-cpp/mcpp.toml +++ b/tests/examples/jwt-cpp/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] jwt-cpp = "0.7.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libaio/mcpp.toml b/tests/examples/libaio/mcpp.toml index 76fd8fda..e3ec56d1 100644 --- a/tests/examples/libaio/mcpp.toml +++ b/tests/examples/libaio/mcpp.toml @@ -14,3 +14,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] libaio = "0.3.113" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libassert/mcpp.toml b/tests/examples/libassert/mcpp.toml index b7e36468..38e17a4e 100644 --- a/tests/examples/libassert/mcpp.toml +++ b/tests/examples/libassert/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] libassert = "2.2.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libassert/tests/assertions.cpp b/tests/examples/libassert/tests/assertions.cpp index d62bfa99..848ca4b3 100644 --- a/tests/examples/libassert/tests/assertions.cpp +++ b/tests/examples/libassert/tests/assertions.cpp @@ -30,17 +30,18 @@ #endif // Both packages build objects rather than shared libraries, so the -// declarations this TU sees must be plain. Each delivers that with a shim in -// front of the one header that reads its macro — no descriptor key carries a -// define into a consumer's TUs. On Linux the difference is only a visibility +// declarations this TU sees must be plain. Each states its macro as a +// `staticlib` feature that `default` implies; a feature's defines reach every +// TU that receives the package's include directories, a transitive consumer's +// included. On Linux the difference is only a visibility // attribute, so a regression is invisible; on the MSVC ABI it is `dllimport` // against a locally defined symbol, which is exactly how this member first // failed on the windows CI leg. #if !defined(LIBASSERT_STATIC_DEFINE) -# error "LIBASSERT_STATIC_DEFINE is not set — the compat.libassert platform.hpp shim was not reached" +# error "LIBASSERT_STATIC_DEFINE is not set — compat.libassert's staticlib feature did not reach this consumer" #endif #if !defined(CPPTRACE_STATIC_DEFINE) -# error "CPPTRACE_STATIC_DEFINE is not set — compat.cpptrace's basic.hpp shim did not reach a transitive consumer" +# error "CPPTRACE_STATIC_DEFINE is not set — compat.cpptrace's staticlib feature did not reach a transitive consumer" #endif static std::string captured; diff --git a/tests/examples/libcoro/mcpp.toml b/tests/examples/libcoro/mcpp.toml index aa04fca1..fc894ba5 100644 --- a/tests/examples/libcoro/mcpp.toml +++ b/tests/examples/libcoro/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] libcoro = "0.16.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libdrm/mcpp.toml b/tests/examples/libdrm/mcpp.toml index 748bfaa3..305954e7 100644 --- a/tests/examples/libdrm/mcpp.toml +++ b/tests/examples/libdrm/mcpp.toml @@ -15,3 +15,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] libdrm = "2.4.134" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libevent/mcpp.toml b/tests/examples/libevent/mcpp.toml index a5ef217e..a405ea22 100644 --- a/tests/examples/libevent/mcpp.toml +++ b/tests/examples/libevent/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] libevent = "2.1.13" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libffi/mcpp.toml b/tests/examples/libffi/mcpp.toml index 8877ae18..8cbd0a4b 100644 --- a/tests/examples/libffi/mcpp.toml +++ b/tests/examples/libffi/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] libffi = "3.4.8" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libgbm/mcpp.toml b/tests/examples/libgbm/mcpp.toml index 077e3114..dcac9016 100644 --- a/tests/examples/libgbm/mcpp.toml +++ b/tests/examples/libgbm/mcpp.toml @@ -37,3 +37,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] libgbm = "25.0.7" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libinput/mcpp.toml b/tests/examples/libinput/mcpp.toml index 2e0c7fee..590510bd 100644 --- a/tests/examples/libinput/mcpp.toml +++ b/tests/examples/libinput/mcpp.toml @@ -20,3 +20,7 @@ standard = "c++23" [target.'cfg(linux)'.dependencies.compat] libinput = "1.31.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libmysqlclient/mcpp.toml b/tests/examples/libmysqlclient/mcpp.toml index f0fdfa3c..847059fd 100644 --- a/tests/examples/libmysqlclient/mcpp.toml +++ b/tests/examples/libmysqlclient/mcpp.toml @@ -21,3 +21,7 @@ libmysqlclient = "8.4.6" [target.'cfg(windows)'.build] cxxflags = ["-DHAVE_LIBMYSQLCLIENT=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libpng/mcpp.toml b/tests/examples/libpng/mcpp.toml index 806ef363..901ded79 100644 --- a/tests/examples/libpng/mcpp.toml +++ b/tests/examples/libpng/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] libpng = "1.6.43" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libseat/mcpp.toml b/tests/examples/libseat/mcpp.toml index 01ce5c56..0fa133ba 100644 --- a/tests/examples/libseat/mcpp.toml +++ b/tests/examples/libseat/mcpp.toml @@ -5,3 +5,7 @@ standard = "c++23" [target.'cfg(linux)'.dependencies.compat] libseat = "0.9.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libserial/mcpp.toml b/tests/examples/libserial/mcpp.toml index 5f40c911..20ebd428 100644 --- a/tests/examples/libserial/mcpp.toml +++ b/tests/examples/libserial/mcpp.toml @@ -17,3 +17,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] libserial = "1.0.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libudev/mcpp.toml b/tests/examples/libudev/mcpp.toml index bc264b35..2d02f8d0 100644 --- a/tests/examples/libudev/mcpp.toml +++ b/tests/examples/libudev/mcpp.toml @@ -5,3 +5,7 @@ standard = "c++23" [target.'cfg(linux)'.dependencies.compat] libudev = "1.0.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libvpx/mcpp.toml b/tests/examples/libvpx/mcpp.toml index 49230255..88b879cc 100644 --- a/tests/examples/libvpx/mcpp.toml +++ b/tests/examples/libvpx/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.libvpx = "1.17.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libwebm/mcpp.toml b/tests/examples/libwebm/mcpp.toml index 0ba82c21..3e814a43 100644 --- a/tests/examples/libwebm/mcpp.toml +++ b/tests/examples/libwebm/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.libwebm = "1.0.0.32" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/libwebp/mcpp.toml b/tests/examples/libwebp/mcpp.toml index 12811199..5e1a994e 100644 --- a/tests/examples/libwebp/mcpp.toml +++ b/tests/examples/libwebp/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] libwebp = { version = "1.5.0", features = ["demux", "mux"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/md4c/mcpp.toml b/tests/examples/md4c/mcpp.toml index 6aafd10b..44842b88 100644 --- a/tests/examples/md4c/mcpp.toml +++ b/tests/examples/md4c/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] md4c = "0.5.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/mimalloc/mcpp.toml b/tests/examples/mimalloc/mcpp.toml index c88c7fd3..8f163dbf 100644 --- a/tests/examples/mimalloc/mcpp.toml +++ b/tests/examples/mimalloc/mcpp.toml @@ -12,3 +12,7 @@ version = "0.1.0" [dependencies.compat] mimalloc = "3.6.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/miniaudio/mcpp.toml b/tests/examples/miniaudio/mcpp.toml index a00c5122..024af5f6 100644 --- a/tests/examples/miniaudio/mcpp.toml +++ b/tests/examples/miniaudio/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] miniaudio = "0.11.25" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/mio/mcpp.toml b/tests/examples/mio/mcpp.toml index cf7e8c88..16f1c741 100644 --- a/tests/examples/mio/mcpp.toml +++ b/tests/examples/mio/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] mio = "2023.3.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/msdfgen/mcpp.toml b/tests/examples/msdfgen/mcpp.toml index 684b60e8..a9c8f047 100644 --- a/tests/examples/msdfgen/mcpp.toml +++ b/tests/examples/msdfgen/mcpp.toml @@ -9,3 +9,7 @@ version = "0.1.0" [dependencies.compat] msdfgen = "1.13" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/mtdev/mcpp.toml b/tests/examples/mtdev/mcpp.toml index 1447277a..14be8834 100644 --- a/tests/examples/mtdev/mcpp.toml +++ b/tests/examples/mtdev/mcpp.toml @@ -5,3 +5,7 @@ standard = "c++23" [target.'cfg(linux)'.dependencies.compat] mtdev = "1.1.7" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/mtest-capi/mcpp.toml b/tests/examples/mtest-capi/mcpp.toml index 6d2b506a..6c0dfdba 100644 --- a/tests/examples/mtest-capi/mcpp.toml +++ b/tests/examples/mtest-capi/mcpp.toml @@ -4,8 +4,5 @@ name = "mtest-capi-tests" version = "0.1.0" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. - [dependencies] mcpplibs.mtest.capi = "0.5.2" diff --git a/tests/examples/mtest-doctest/mcpp.toml b/tests/examples/mtest-doctest/mcpp.toml index b8070ee2..e297477e 100644 --- a/tests/examples/mtest-doctest/mcpp.toml +++ b/tests/examples/mtest-doctest/mcpp.toml @@ -5,8 +5,5 @@ name = "mtest-doctest-tests" version = "0.1.0" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. - [dev-dependencies] mcpplibs.mtest.doctest = "0.11.3" diff --git a/tests/examples/mtest-gtest/mcpp.toml b/tests/examples/mtest-gtest/mcpp.toml index 18ebac7a..e1fab107 100644 --- a/tests/examples/mtest-gtest/mcpp.toml +++ b/tests/examples/mtest-gtest/mcpp.toml @@ -5,9 +5,6 @@ name = "mtest-gtest-tests" version = "0.1.0" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. - [dev-dependencies] compat.gtest = "1.18.0" mcpplibs.mtest.gtest = "0.5.2" diff --git a/tests/examples/mtest-manifest/mcpp.toml b/tests/examples/mtest-manifest/mcpp.toml index 004b731d..5c8680f1 100644 --- a/tests/examples/mtest-manifest/mcpp.toml +++ b/tests/examples/mtest-manifest/mcpp.toml @@ -4,8 +4,5 @@ name = "mtest-manifest-tests" version = "0.1.0" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. - [dependencies] mcpplibs.mtest.manifest = "0.5.2" diff --git a/tests/examples/mtest/mcpp.toml b/tests/examples/mtest/mcpp.toml index fe391ff8..c96bfb88 100644 --- a/tests/examples/mtest/mcpp.toml +++ b/tests/examples/mtest/mcpp.toml @@ -5,8 +5,5 @@ name = "mtest-tests" version = "0.1.0" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. - [dev-dependencies] mcpplibs.mtest = "0.5.2" diff --git a/tests/examples/muduo/mcpp.toml b/tests/examples/muduo/mcpp.toml index afe09e0d..14ece3f0 100644 --- a/tests/examples/muduo/mcpp.toml +++ b/tests/examples/muduo/mcpp.toml @@ -5,3 +5,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] muduo = "2.0.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/mysql-connector-cpp/mcpp.toml b/tests/examples/mysql-connector-cpp/mcpp.toml index 503250c6..8319e8d3 100644 --- a/tests/examples/mysql-connector-cpp/mcpp.toml +++ b/tests/examples/mysql-connector-cpp/mcpp.toml @@ -15,3 +15,7 @@ mysql-connector-cpp = "26.7.0" [target.'cfg(macos)'.build] cxxflags = ["-DHAVE_MYSQL_CONNECTOR_CPP=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/nanodbc/mcpp.toml b/tests/examples/nanodbc/mcpp.toml index 84e049dd..118b9801 100644 --- a/tests/examples/nanodbc/mcpp.toml +++ b/tests/examples/nanodbc/mcpp.toml @@ -16,3 +16,7 @@ nanodbc = "2.14.0" [target.'cfg(linux)'.build] cxxflags = ["-DHAVE_NANODBC=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/nanosvg/mcpp.toml b/tests/examples/nanosvg/mcpp.toml index 3af2b6d7..d26e6731 100644 --- a/tests/examples/nanosvg/mcpp.toml +++ b/tests/examples/nanosvg/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] nanosvg = "2026.07.09" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/openblas/mcpp.toml b/tests/examples/openblas/mcpp.toml index e516d6c9..87cf3a52 100644 --- a/tests/examples/openblas/mcpp.toml +++ b/tests/examples/openblas/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" openblas = "0.3.33" [target.'cfg(windows)'.build] cxxflags = ["-DHAVE_OPENBLAS=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/opencl/mcpp.toml b/tests/examples/opencl/mcpp.toml index a471c5c1..4a688631 100644 --- a/tests/examples/opencl/mcpp.toml +++ b/tests/examples/opencl/mcpp.toml @@ -17,3 +17,7 @@ opencl = "2026.05.29" [build] cxxflags = ["-DHAVE_OPENCL_LOADER=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/openssl/mcpp.toml b/tests/examples/openssl/mcpp.toml index d5425401..3e35c17c 100644 --- a/tests/examples/openssl/mcpp.toml +++ b/tests/examples/openssl/mcpp.toml @@ -33,3 +33,7 @@ openssl = "3.5.9" [target.'cfg(windows)'.build] cxxflags = ["-DHAVE_OPENSSL=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/opus/mcpp.toml b/tests/examples/opus/mcpp.toml index bd1472a2..0cadeeef 100644 --- a/tests/examples/opus/mcpp.toml +++ b/tests/examples/opus/mcpp.toml @@ -9,3 +9,7 @@ standard = "c++23" compat.ogg = "1.3.6" compat.opus = "1.6.1" compat.opusfile = "0.12" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/pixman/mcpp.toml b/tests/examples/pixman/mcpp.toml index 51d0bf76..41677356 100644 --- a/tests/examples/pixman/mcpp.toml +++ b/tests/examples/pixman/mcpp.toml @@ -9,3 +9,7 @@ standard = "c++23" [target.'cfg(linux)'.dependencies.compat] pixman = "0.46.4" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/plf-hive/mcpp.toml b/tests/examples/plf-hive/mcpp.toml index 83ca2350..1351d8c5 100644 --- a/tests/examples/plf-hive/mcpp.toml +++ b/tests/examples/plf-hive/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [dependencies.compat] plf-hive = "2026.07.31" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/pocketpy/mcpp.toml b/tests/examples/pocketpy/mcpp.toml index 90e7c311..ad46622b 100644 --- a/tests/examples/pocketpy/mcpp.toml +++ b/tests/examples/pocketpy/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.pocketpy = "2.2.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/protobuf-gzip/mcpp.toml b/tests/examples/protobuf-gzip/mcpp.toml index 884cc3b0..e2742445 100644 --- a/tests/examples/protobuf-gzip/mcpp.toml +++ b/tests/examples/protobuf-gzip/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] protobuf = { version = "35.1", features = ["gzip"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/protobuf-protoc/mcpp.toml b/tests/examples/protobuf-protoc/mcpp.toml index 82ae3b1d..caa1e4a2 100644 --- a/tests/examples/protobuf-protoc/mcpp.toml +++ b/tests/examples/protobuf-protoc/mcpp.toml @@ -35,3 +35,7 @@ protobuf = { version = "35.1", tools = ["protoc"] } # The runtime alone, so the member still builds and links something real here. [target.'cfg(windows)'.dependencies.compat] protobuf = "35.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/protobuf-upb/mcpp.toml b/tests/examples/protobuf-upb/mcpp.toml index c19f1adf..248e12d7 100644 --- a/tests/examples/protobuf-upb/mcpp.toml +++ b/tests/examples/protobuf-upb/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] protobuf = { version = "35.1", features = ["upb"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/protobuf/mcpp.toml b/tests/examples/protobuf/mcpp.toml index b90ce982..d9402ac9 100644 --- a/tests/examples/protobuf/mcpp.toml +++ b/tests/examples/protobuf/mcpp.toml @@ -15,3 +15,7 @@ version = "0.1.0" [dependencies.compat] protobuf = "35.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/quickjs-ng/mcpp.toml b/tests/examples/quickjs-ng/mcpp.toml index dab6a6f3..c68a2512 100644 --- a/tests/examples/quickjs-ng/mcpp.toml +++ b/tests/examples/quickjs-ng/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] quickjs-ng = "0.17.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/re2/mcpp.toml b/tests/examples/re2/mcpp.toml index 48339233..ecc1c66a 100644 --- a/tests/examples/re2/mcpp.toml +++ b/tests/examples/re2/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] re2 = "2022-04-01" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/recastnavigation-features/mcpp.toml b/tests/examples/recastnavigation-features/mcpp.toml index e405eee3..e92038ce 100644 --- a/tests/examples/recastnavigation-features/mcpp.toml +++ b/tests/examples/recastnavigation-features/mcpp.toml @@ -22,3 +22,7 @@ version = "0.1.0" [dependencies.compat] recastnavigation = { version = "1.6.0", features = ["crowd", "debug-utils"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/recastnavigation/mcpp.toml b/tests/examples/recastnavigation/mcpp.toml index a0951e2a..2d2261c7 100644 --- a/tests/examples/recastnavigation/mcpp.toml +++ b/tests/examples/recastnavigation/mcpp.toml @@ -22,3 +22,7 @@ version = "0.1.0" [dependencies.compat] recastnavigation = "1.6.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/redis-plus-plus-async/mcpp.toml b/tests/examples/redis-plus-plus-async/mcpp.toml index 1e0b7967..60c06079 100644 --- a/tests/examples/redis-plus-plus-async/mcpp.toml +++ b/tests/examples/redis-plus-plus-async/mcpp.toml @@ -14,3 +14,7 @@ version = "0.1.0" [dependencies.compat] redis-plus-plus = { version = "1.3.13", features = ["async"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/redis-plus-plus-v133/mcpp.toml b/tests/examples/redis-plus-plus-v133/mcpp.toml index 40940f8d..fd41c07e 100644 --- a/tests/examples/redis-plus-plus-v133/mcpp.toml +++ b/tests/examples/redis-plus-plus-v133/mcpp.toml @@ -19,3 +19,7 @@ redis-plus-plus = "1.3.3" # first) needs the same force-include the package uses. [build] cxxflags = ["-include", "cstdint"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/redis-plus-plus/mcpp.toml b/tests/examples/redis-plus-plus/mcpp.toml index e32f77aa..14b91091 100644 --- a/tests/examples/redis-plus-plus/mcpp.toml +++ b/tests/examples/redis-plus-plus/mcpp.toml @@ -15,3 +15,7 @@ version = "0.1.0" [dependencies.compat] redis-plus-plus = "1.3.13" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/reflectcpp/mcpp.toml b/tests/examples/reflectcpp/mcpp.toml index a688d7fc..6d345e42 100644 --- a/tests/examples/reflectcpp/mcpp.toml +++ b/tests/examples/reflectcpp/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] reflectcpp = "0.25.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/safeint-c-api/mcpp.toml b/tests/examples/safeint-c-api/mcpp.toml index 413efab7..bc293793 100644 --- a/tests/examples/safeint-c-api/mcpp.toml +++ b/tests/examples/safeint-c-api/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] safeint = "3.0.28a" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/safeint/mcpp.toml b/tests/examples/safeint/mcpp.toml index 99e88cd7..d9f63088 100644 --- a/tests/examples/safeint/mcpp.toml +++ b/tests/examples/safeint/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] safeint = "3.0.28a" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sdl2/mcpp.toml b/tests/examples/sdl2/mcpp.toml index 3c90ad29..c2485abb 100644 --- a/tests/examples/sdl2/mcpp.toml +++ b/tests/examples/sdl2/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] sdl2 = "2.32.10" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sdl3/mcpp.toml b/tests/examples/sdl3/mcpp.toml index 63f111df..b3efd2fc 100644 --- a/tests/examples/sdl3/mcpp.toml +++ b/tests/examples/sdl3/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [dependencies.compat] sdl3 = "3.4.18" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sheenbidi/mcpp.toml b/tests/examples/sheenbidi/mcpp.toml index 1e5ecc42..5b15d7f6 100644 --- a/tests/examples/sheenbidi/mcpp.toml +++ b/tests/examples/sheenbidi/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.sheenbidi = "3.0.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/slint/mcpp.toml b/tests/examples/slint/mcpp.toml index ebd442c1..df875969 100644 --- a/tests/examples/slint/mcpp.toml +++ b/tests/examples/slint/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.slint = "1.19.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/spdlog-compiled/mcpp.toml b/tests/examples/spdlog-compiled/mcpp.toml index 42209d1a..ec7599ea 100644 --- a/tests/examples/spdlog-compiled/mcpp.toml +++ b/tests/examples/spdlog-compiled/mcpp.toml @@ -14,3 +14,7 @@ version = "0.1.0" [dependencies.compat] spdlog = { version = "1.17.0", features = ["compiled"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/spdlog/mcpp.toml b/tests/examples/spdlog/mcpp.toml index 7ae9ef99..eb697469 100644 --- a/tests/examples/spdlog/mcpp.toml +++ b/tests/examples/spdlog/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies.compat] spdlog = "1.17.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/spirv-headers/mcpp.toml b/tests/examples/spirv-headers/mcpp.toml index 2f1b5691..2bdbfa84 100644 --- a/tests/examples/spirv-headers/mcpp.toml +++ b/tests/examples/spirv-headers/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] spirv-headers = "1.4.357.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/spirv-reflect/mcpp.toml b/tests/examples/spirv-reflect/mcpp.toml index d18422f5..8c3a07fa 100644 --- a/tests/examples/spirv-reflect/mcpp.toml +++ b/tests/examples/spirv-reflect/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] spirv-reflect = "1.4.357.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sqlite3/mcpp.toml b/tests/examples/sqlite3/mcpp.toml index bc46866f..919be1d2 100644 --- a/tests/examples/sqlite3/mcpp.toml +++ b/tests/examples/sqlite3/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] sqlite3 = "3.45.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sqlitecpp/mcpp.toml b/tests/examples/sqlitecpp/mcpp.toml index f0b71d52..452d0314 100644 --- a/tests/examples/sqlitecpp/mcpp.toml +++ b/tests/examples/sqlitecpp/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [dependencies.compat] sqlitecpp = "3.3.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/sycl-runtime/mcpp.toml b/tests/examples/sycl-runtime/mcpp.toml index 22d84692..672b535a 100644 --- a/tests/examples/sycl-runtime/mcpp.toml +++ b/tests/examples/sycl-runtime/mcpp.toml @@ -16,3 +16,7 @@ linux = "gcc@16.1.0" [target.'cfg(linux)'.dependencies.compat] sycl-runtime = "2026.09.10" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/tl-optional/mcpp.toml b/tests/examples/tl-optional/mcpp.toml index 87473f16..32d5795c 100644 --- a/tests/examples/tl-optional/mcpp.toml +++ b/tests/examples/tl-optional/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] tl-optional = "1.1.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/tray/mcpp.toml b/tests/examples/tray/mcpp.toml index b40200ce..0cee4c5b 100644 --- a/tests/examples/tray/mcpp.toml +++ b/tests/examples/tray/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] tray = "0.0.0-8dd1358" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/usockets/mcpp.toml b/tests/examples/usockets/mcpp.toml index 02b15407..7d3c60c2 100644 --- a/tests/examples/usockets/mcpp.toml +++ b/tests/examples/usockets/mcpp.toml @@ -12,3 +12,7 @@ usockets = "0.8.8" # SAME pair the library was — an index descriptor's cflags reach only the # package's own TUs. Getting this wrong does not fail to build; it corrupts. defines = ["LIBUS_USE_LIBUV", "LIBUS_NO_SSL"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/uwebsockets/mcpp.toml b/tests/examples/uwebsockets/mcpp.toml index 5b97ba78..8bd33623 100644 --- a/tests/examples/uwebsockets/mcpp.toml +++ b/tests/examples/uwebsockets/mcpp.toml @@ -12,3 +12,7 @@ uwebsockets = "20.79.0" # was built (us_loop_t layout, SSL declarations); UWS_NO_ZLIB matches the # package's zlib-free build. defines = ["LIBUS_USE_LIBUV", "LIBUS_NO_SSL", "UWS_NO_ZLIB"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/vulkan-memory-allocator/mcpp.toml b/tests/examples/vulkan-memory-allocator/mcpp.toml index 249f3879..d1d777e7 100644 --- a/tests/examples/vulkan-memory-allocator/mcpp.toml +++ b/tests/examples/vulkan-memory-allocator/mcpp.toml @@ -8,3 +8,7 @@ version = "0.1.0" [dependencies.compat] vulkan-memory-allocator = "3.4.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/vulkan/mcpp.toml b/tests/examples/vulkan/mcpp.toml index 46d0c66d..d9c621a9 100644 --- a/tests/examples/vulkan/mcpp.toml +++ b/tests/examples/vulkan/mcpp.toml @@ -10,3 +10,7 @@ vulkan = "1.4.357.3" # switch tests/loader.cpp keys off; it is unconditional again. [build] cxxflags = ["-DHAVE_VULKAN_LOADER=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wamr-features/mcpp.toml b/tests/examples/wamr-features/mcpp.toml index 5be10ddd..30111a70 100644 --- a/tests/examples/wamr-features/mcpp.toml +++ b/tests/examples/wamr-features/mcpp.toml @@ -9,3 +9,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] wamr = { version = "2.4.5", features = ["libc-builtin", "libc-wasi"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wamr-runtime-features/mcpp.toml b/tests/examples/wamr-runtime-features/mcpp.toml index 5ffa37a8..0c0e8bb8 100644 --- a/tests/examples/wamr-runtime-features/mcpp.toml +++ b/tests/examples/wamr-runtime-features/mcpp.toml @@ -7,3 +7,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] wamr = { version = "2.4.5", features = ["no-hw-bound-check", "instruction-metering", "thread-mgr"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wamr/mcpp.toml b/tests/examples/wamr/mcpp.toml index 5d32b559..939b649e 100644 --- a/tests/examples/wamr/mcpp.toml +++ b/tests/examples/wamr/mcpp.toml @@ -13,3 +13,7 @@ version = "0.1.0" [target.'cfg(linux)'.dependencies.compat] wamr = "2.4.5" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/websocket-features/mcpp.toml b/tests/examples/websocket-features/mcpp.toml index ff083430..d57c2248 100644 --- a/tests/examples/websocket-features/mcpp.toml +++ b/tests/examples/websocket-features/mcpp.toml @@ -15,3 +15,7 @@ version = "0.1.0" [dependencies.compat] websocket = { version = "12.0.1", features = ["server", "zlib"] } + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/websocket-tls/mcpp.toml b/tests/examples/websocket-tls/mcpp.toml index 343347ed..7d927ff3 100644 --- a/tests/examples/websocket-tls/mcpp.toml +++ b/tests/examples/websocket-tls/mcpp.toml @@ -27,3 +27,7 @@ websocket = { version = "12.0.1", features = ["tls", "server"] } [target.'cfg(windows)'.build] cxxflags = ["-DHAVE_WEBSOCKET_TLS=1"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/websocket/mcpp.toml b/tests/examples/websocket/mcpp.toml index f4cffcec..60f642b5 100644 --- a/tests/examples/websocket/mcpp.toml +++ b/tests/examples/websocket/mcpp.toml @@ -13,3 +13,7 @@ version = "0.1.0" [dependencies.compat] websocket = "12.0.1" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wil/mcpp.toml b/tests/examples/wil/mcpp.toml index 24ae385a..1007b503 100644 --- a/tests/examples/wil/mcpp.toml +++ b/tests/examples/wil/mcpp.toml @@ -11,3 +11,7 @@ wil = "1.0.260126.7" [target.'cfg(windows)'.build] ldflags = ["-lole32", "-loleaut32"] + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wolfssl/mcpp.toml b/tests/examples/wolfssl/mcpp.toml index 5d6c7fe1..a30b1eb1 100644 --- a/tests/examples/wolfssl/mcpp.toml +++ b/tests/examples/wolfssl/mcpp.toml @@ -9,3 +9,7 @@ version = "0.1.0" [dependencies.compat] wolfssl = "5.9.4" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/wuffs/mcpp.toml b/tests/examples/wuffs/mcpp.toml index bf1c25d4..01248954 100644 --- a/tests/examples/wuffs/mcpp.toml +++ b/tests/examples/wuffs/mcpp.toml @@ -7,3 +7,7 @@ standard = "c++23" [dependencies] compat.wuffs = "0.3.6" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/xsimd/mcpp.toml b/tests/examples/xsimd/mcpp.toml index 68eb2e66..15f4c176 100644 --- a/tests/examples/xsimd/mcpp.toml +++ b/tests/examples/xsimd/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] xsimd = "14.3.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/xxhash/mcpp.toml b/tests/examples/xxhash/mcpp.toml index b06de7d5..3c6a10d0 100644 --- a/tests/examples/xxhash/mcpp.toml +++ b/tests/examples/xxhash/mcpp.toml @@ -6,3 +6,7 @@ version = "0.1.0" [dependencies.compat] xxhash = "0.8.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/yaml-cpp-v080/mcpp.toml b/tests/examples/yaml-cpp-v080/mcpp.toml index 36002c55..81273da8 100644 --- a/tests/examples/yaml-cpp-v080/mcpp.toml +++ b/tests/examples/yaml-cpp-v080/mcpp.toml @@ -9,3 +9,7 @@ version = "0.1.0" [dependencies.compat] yaml-cpp = "0.8.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/yaml-cpp-v080/tests/yaml.cpp b/tests/examples/yaml-cpp-v080/tests/yaml.cpp index 3484f982..84b11550 100644 --- a/tests/examples/yaml-cpp-v080/tests/yaml.cpp +++ b/tests/examples/yaml-cpp-v080/tests/yaml.cpp @@ -22,13 +22,13 @@ // The package builds objects, not a shared library, so every yaml-cpp // declaration this TU sees must be plain -- not dllimport. The package -// delivers that with a shim in front of yaml-cpp/dll.h, because no descriptor -// key carries a define to a consumer's TUs. On Linux the difference is only a -// visibility attribute and everything links anyway; on the MSVC ABI it is a -// link failure. Asserting it at compile time fails everywhere the moment the -// shim stops being reached. +// states YAML_CPP_STATIC_DEFINE as a `staticlib` feature that `default` +// implies; a feature's defines reach the consumer's TUs. On Linux the +// difference is only a visibility attribute and everything links anyway; on +// the MSVC ABI it is a link failure. Asserting it at compile time fails +// everywhere the moment the define stops being delivered. #ifndef YAML_CPP_STATIC_DEFINE -# error "YAML_CPP_STATIC_DEFINE did not reach the consumer: the yaml-cpp/dll.h shim was not found first" +# error "YAML_CPP_STATIC_DEFINE did not reach the consumer: compat.yaml-cpp's staticlib feature is not active" #endif // Proves this member resolved 0.8.0 and not the newest version: the header diff --git a/tests/examples/yaml-cpp/mcpp.toml b/tests/examples/yaml-cpp/mcpp.toml index 4eadbd7e..ee22fa7a 100644 --- a/tests/examples/yaml-cpp/mcpp.toml +++ b/tests/examples/yaml-cpp/mcpp.toml @@ -10,3 +10,7 @@ version = "0.1.0" [dependencies.compat] yaml-cpp = "0.9.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/yaml-cpp/tests/yaml.cpp b/tests/examples/yaml-cpp/tests/yaml.cpp index cd9ee337..a68604cc 100644 --- a/tests/examples/yaml-cpp/tests/yaml.cpp +++ b/tests/examples/yaml-cpp/tests/yaml.cpp @@ -23,13 +23,13 @@ // The package builds objects, not a shared library, so every yaml-cpp // declaration this TU sees must be plain -- not dllimport. The package -// delivers that with a shim in front of yaml-cpp/dll.h, because no descriptor -// key carries a define to a consumer's TUs. On Linux the difference is only a -// visibility attribute and everything links anyway; on the MSVC ABI it is a -// link failure. Asserting it at compile time fails everywhere the moment the -// shim stops being reached. +// states YAML_CPP_STATIC_DEFINE as a `staticlib` feature that `default` +// implies; a feature's defines reach the consumer's TUs. On Linux the +// difference is only a visibility attribute and everything links anyway; on +// the MSVC ABI it is a link failure. Asserting it at compile time fails +// everywhere the moment the define stops being delivered. #ifndef YAML_CPP_STATIC_DEFINE -# error "YAML_CPP_STATIC_DEFINE did not reach the consumer: the yaml-cpp/dll.h shim was not found first" +# error "YAML_CPP_STATIC_DEFINE did not reach the consumer: compat.yaml-cpp's staticlib feature is not active" #endif namespace { diff --git a/tests/examples/yyjson/mcpp.toml b/tests/examples/yyjson/mcpp.toml index 059b05e9..c555fcad 100644 --- a/tests/examples/yyjson/mcpp.toml +++ b/tests/examples/yyjson/mcpp.toml @@ -4,3 +4,7 @@ version = "0.1.0" [dependencies.compat] yyjson = "0.12.0" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/zlib-ng/mcpp.toml b/tests/examples/zlib-ng/mcpp.toml index cf39f114..f112c048 100644 --- a/tests/examples/zlib-ng/mcpp.toml +++ b/tests/examples/zlib-ng/mcpp.toml @@ -11,3 +11,7 @@ version = "0.1.0" [dependencies] compat.zlib-ng = "2.3.3" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/examples/zlib/mcpp.toml b/tests/examples/zlib/mcpp.toml index ce329ca8..1e7cc43c 100644 --- a/tests/examples/zlib/mcpp.toml +++ b/tests/examples/zlib/mcpp.toml @@ -9,3 +9,7 @@ version = "0.1.0" [dependencies.compat] zlib = "1.3.2" + +# The candidate index: this checkout (compat.*), not the published one. +[indices] +compat = { path = "../../.." } diff --git a/tests/mwrap/abseil-basics/mcpp.toml b/tests/mwrap/abseil-basics/mcpp.toml index a42f9288..086fe64c 100644 --- a/tests/mwrap/abseil-basics/mcpp.toml +++ b/tests/mwrap/abseil-basics/mcpp.toml @@ -3,9 +3,5 @@ name = "abseil-basics" version = "20250512.1" description = "Consume the immutable Abseil wrapper: strings, a hash map, StatusOr with its error path, civil time in UTC, a mutex shared by threads, the mapped release constant" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.abseil = "20250512.1" diff --git a/tests/mwrap/accesskit-tree/mcpp.toml b/tests/mwrap/accesskit-tree/mcpp.toml index e44f3ee3..156c62e6 100644 --- a/tests/mwrap/accesskit-tree/mcpp.toml +++ b/tests/mwrap/accesskit-tree/mcpp.toml @@ -3,9 +3,5 @@ name = "accesskit-tree" version = "0.23.1" description = "Consume the immutable accesskit wrapper: build a tree update through the module and read it back" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.accesskit" = "0.23.1" +mcpplibs.mwrap.accesskit = "0.23.1" diff --git a/tests/mwrap/acl-clip/mcpp.toml b/tests/mwrap/acl-clip/mcpp.toml index 97ed1bb7..b41d3e58 100644 --- a/tests/mwrap/acl-clip/mcpp.toml +++ b/tests/mwrap/acl-clip/mcpp.toml @@ -3,10 +3,6 @@ name = "acl-clip" version = "2.1.0" description = "Consume the immutable ACL wrapper: a five-joint chain compressed within its error twice to the same bytes and played back at five times; the compressed bytes and the poses pinned" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.acl = "2.1.0" diff --git a/tests/mwrap/basis-universal-transcode/mcpp.toml b/tests/mwrap/basis-universal-transcode/mcpp.toml index b2bee79d..853c14c6 100644 --- a/tests/mwrap/basis-universal-transcode/mcpp.toml +++ b/tests/mwrap/basis-universal-transcode/mcpp.toml @@ -3,9 +3,5 @@ name = "basis-universal-transcode" version = "2.50.1" description = "Consume the immutable Basis Universal wrapper: the transcoder made ready, what it can write and how large a block is, what is no KTX2 file refused, the adapted constants" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.basis_universal = "2.50.1" diff --git a/tests/mwrap/box2d-physics/mcpp.toml b/tests/mwrap/box2d-physics/mcpp.toml index e05e7479..b97d74b7 100644 --- a/tests/mwrap/box2d-physics/mcpp.toml +++ b/tests/mwrap/box2d-physics/mcpp.toml @@ -3,9 +3,5 @@ name = "box2d-physics" version = "3.2.0" description = "Consume the immutable Box2D wrapper: a world that steps, collides and sleeps, a ray cast, the mapped constants and id macros, the struck-pyramid determinism hash every platform computes, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.box2d" = "3.2.0" +mcpplibs.mwrap.box2d = "3.2.0" diff --git a/tests/mwrap/cgltf-inspect/mcpp.toml b/tests/mwrap/cgltf-inspect/mcpp.toml index 60de10f3..e737bb54 100644 --- a/tests/mwrap/cgltf-inspect/mcpp.toml +++ b/tests/mwrap/cgltf-inspect/mcpp.toml @@ -3,9 +3,5 @@ name = "cgltf-inspect" version = "1.15" description = "Consume the immutable cgltf wrapper: parse a glTF document, load and validate its buffer, read its accessors, write it and parse it again" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.cgltf = "1.15" diff --git a/tests/mwrap/check_git_index_discovery.py b/tests/mwrap/check_git_index_discovery.py index d9efbaef..61fc4e6a 100644 --- a/tests/mwrap/check_git_index_discovery.py +++ b/tests/mwrap/check_git_index_discovery.py @@ -10,8 +10,8 @@ PACKAGES = { - "opencv": "5.0.0.1", "onnxruntime": "1.25.1.1", "llamacpp": "b10069", - "ffmpeg": "8.1.2.1", "grpc": "1.83.0", "imgui": "1.92.8", "godot_cpp": "10.0.0", + "opencv": "5.0.0.1", "onnxruntime": "1.25.1.1", "llamacpp": "b10069.2", + "ffmpeg": "8.1.2.1", "grpc": "1.83.0", "imgui": "1.92.8.1", "godot_cpp": "10.0.0.1", } @@ -62,7 +62,12 @@ def run(*arguments): project_name = "git-" + name.replace("_", "-") run("new", project_name, "--template", selector) manifest = tomllib.loads((root / project_name / "mcpp.toml").read_text()) - dependency = manifest["dependencies"][identity] + # The key as written: quoted (one key) or dotted (nested tables). + dependency = manifest["dependencies"].get(identity) + if dependency is None: + dependency = manifest["dependencies"] + for part in identity.split("."): + dependency = dependency[part] actual = dependency if isinstance(dependency, str) else dependency["version"] assert actual == version, (identity, dependency) print("Verified Git-index identity and unmodified scaffold", selector, flush=True) diff --git a/tests/mwrap/check_installed_template.py b/tests/mwrap/check_installed_template.py index 15cac095..720d7089 100644 --- a/tests/mwrap/check_installed_template.py +++ b/tests/mwrap/check_installed_template.py @@ -79,31 +79,28 @@ def main(): subprocess.run(command, cwd=temporary, env=env, check=True) project = temporary / "installed-quickstart" manifest = tomllib.loads((project / "mcpp.toml").read_text(encoding="utf-8")) - # The key as written: quoted (one key) or dotted (nested tables), the form mcpp 2026.11.8.1 asks for. - quoted_key = identity in manifest["dependencies"] - dependency = manifest["dependencies"].get(identity) - if dependency is None: - dependency = manifest["dependencies"] - for part in identity.split("."): - dependency = dependency[part] + # The key as written is the dotted selector (nested tables), the form mcpp 2026.11.8.1 asks + # for; a quoted key (one key) is deprecated and is removed in 2027.2. + assert identity not in manifest["dependencies"], f"the template writes {identity} quoted" + dependency = manifest["dependencies"] + for part in identity.split("."): + dependency = dependency[part] actual_version = dependency if isinstance(dependency, str) else dependency["version"] - assert actual_version == version, dependency + # The command line's `@` selects by the written prefix (mcpp 2026.11.21.1+, SPEC-001 §4.5): the + # template is rendered for the newest key under it (`@1.3` renders 1.3.1), and the checks + # below read that key's install. An earlier mcpp renders the written key itself. + assert actual_version == version or actual_version.startswith(version + "."), dependency + version = actual_version if isinstance(dependency, dict): assert "path" not in dependency and "git" not in dependency, dependency # The build is strict unless the published template states a reading mcpp # still accepts with a warning: then that warning, and no other, is allowed. # A template's archive is immutable; its next release writes the current form. - # - legacy exact key: an upstream nonnumeric release key, not a version range; - # - quoted key: a template from before mcpp 2026.11.8.1 renders `"{{self.name}}"`, - # one quoted key, where the selector is now written unquoted (mcpp#904). + # - legacy exact key: an upstream nonnumeric release key, not a version range. allowed = [] if args.legacy_exact_key: assert not version[0].isdigit(), "This exception is only for upstream nonnumeric release keys" allowed.append(f"[dependencies] {identity} = '{version}' is not a version RANGE ") - if quoted_key: - allowed.append(f'[dependencies] "{identity}" is deprecated since mcpp 2026.11.8.1') - print(f"note: the template of {identity}@{version} writes its dependency key quoted; " - "its next release writes it unquoted", flush=True) build = [args.mcpp, "build", "--toolchain", args.toolchain] if not allowed: build.append("--strict") diff --git a/tests/mwrap/concurrentqueue-mpmc/mcpp.toml b/tests/mwrap/concurrentqueue-mpmc/mcpp.toml index 699531bd..b5a25fc7 100644 --- a/tests/mwrap/concurrentqueue-mpmc/mcpp.toml +++ b/tests/mwrap/concurrentqueue-mpmc/mcpp.toml @@ -3,9 +3,5 @@ name = "concurrentqueue-mpmc" version = "1.0.5" description = "Consume the immutable concurrentqueue wrapper: multi-producer multi-consumer traffic with tokens and bulk operations, the blocking queue's timed waits, the semaphore, the mapped macros" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.concurrentqueue" = "1.0.5" +mcpplibs.mwrap.concurrentqueue = "1.0.5" diff --git a/tests/mwrap/dr_libs-audio/mcpp.toml b/tests/mwrap/dr_libs-audio/mcpp.toml index deb13b33..7dcd91a9 100644 --- a/tests/mwrap/dr_libs-audio/mcpp.toml +++ b/tests/mwrap/dr_libs-audio/mcpp.toml @@ -3,9 +3,5 @@ name = "dr_libs-audio" version = "2026.03.03" description = "Consume the immutable dr_libs wrapper: a WAV written and read back, a FLAC stream built here decoded and seeked, an MP3 decoded to its gapless length, each header's module alone, the mapped macros, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.dr_libs" = "2026.03.03" +mcpplibs.mwrap.dr_libs = "2026.03.03" diff --git a/tests/mwrap/ffmpeg-cpu/mcpp.toml b/tests/mwrap/ffmpeg-cpu/mcpp.toml index 88e678cf..8fde5923 100644 --- a/tests/mwrap/ffmpeg-cpu/mcpp.toml +++ b/tests/mwrap/ffmpeg-cpu/mcpp.toml @@ -3,9 +3,5 @@ name = "ffmpeg-cpu" version = "8.1.2" description = "Consume the immutable FFmpeg wrapper revision and decode a real raw frame" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.ffmpeg" = "8.1.2.1" +mcpplibs.mwrap.ffmpeg = "8.1.2.1" diff --git a/tests/mwrap/freetype-render/mcpp.toml b/tests/mwrap/freetype-render/mcpp.toml index e9492e94..d06ed0ac 100644 --- a/tests/mwrap/freetype-render/mcpp.toml +++ b/tests/mwrap/freetype-render/mcpp.toml @@ -3,9 +3,5 @@ name = "freetype-render" version = "2.13.3" description = "Consume the immutable FreeType wrapper: a BDF font from memory rendered, an outline built, stroked and rasterised, exact bounding boxes, the mapped macros" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.freetype" = "2.13.3" +mcpplibs.mwrap.freetype = "2.13.3" diff --git a/tests/mwrap/fribidi-bidi/mcpp.toml b/tests/mwrap/fribidi-bidi/mcpp.toml index e0b1c7d4..c2513c38 100644 --- a/tests/mwrap/fribidi-bidi/mcpp.toml +++ b/tests/mwrap/fribidi-bidi/mcpp.toml @@ -3,9 +3,5 @@ name = "fribidi-bidi" version = "1.0.16" description = "Consume the immutable FriBidi wrapper: paragraph levels with bracket pairs, line reordering, log2vis, Arabic shaping, the mapped macros, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.fribidi" = "1.0.16" +mcpplibs.mwrap.fribidi = "1.0.16" diff --git a/tests/mwrap/godot-math/mcpp.toml b/tests/mwrap/godot-math/mcpp.toml index 0b232536..1e1f7972 100644 --- a/tests/mwrap/godot-math/mcpp.toml +++ b/tests/mwrap/godot-math/mcpp.toml @@ -3,9 +3,5 @@ name = "godot-math" version = "10.0.0" description = "Run the immutable godot-cpp module wrapper without an engine" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.godot_cpp" = "10.0.0" +mcpplibs.mwrap.godot_cpp = "10.0.0" diff --git a/tests/mwrap/godot-sdk/mcpp.toml b/tests/mwrap/godot-sdk/mcpp.toml index adc9cda7..8f691b47 100644 --- a/tests/mwrap/godot-sdk/mcpp.toml +++ b/tests/mwrap/godot-sdk/mcpp.toml @@ -1,6 +1,5 @@ [package] name="godot-sdk" version="10.0.0" -[indices] [dependencies.compat] godot-cpp="10.0.0" diff --git a/tests/mwrap/grpc-cpu/mcpp.toml b/tests/mwrap/grpc-cpu/mcpp.toml index 053677c8..c37fd303 100644 --- a/tests/mwrap/grpc-cpu/mcpp.toml +++ b/tests/mwrap/grpc-cpu/mcpp.toml @@ -3,10 +3,6 @@ name = "grpc-cpu" version = "1.83.0.1" description = "Consume the immutable gRPC wrapper revision and check module status semantics" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [target.'cfg(unix)'.dependencies] mcpplibs.mwrap.grpc = "1.83.0.1" diff --git a/tests/mwrap/grpc-protobuf-stack/mcpp.toml b/tests/mwrap/grpc-protobuf-stack/mcpp.toml index 339a5484..8087b59a 100644 --- a/tests/mwrap/grpc-protobuf-stack/mcpp.toml +++ b/tests/mwrap/grpc-protobuf-stack/mcpp.toml @@ -3,10 +3,6 @@ name = "grpc-protobuf-stack" version = "1.83.0.1" description = "Consume the gRPC, Protocol Buffers, Abseil and OpenSSL wrappers in one program: one Abseil, one protobuf, one OpenSSL" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - # gRPC is linux/macOS (its wrapper does not claim Windows), so the stack is too. [target.'cfg(unix)'.dependencies] mcpplibs.mwrap.grpc = "1.83.0.1" diff --git a/tests/mwrap/grpc-tools/mcpp.toml b/tests/mwrap/grpc-tools/mcpp.toml index bab6b806..016402d3 100644 --- a/tests/mwrap/grpc-tools/mcpp.toml +++ b/tests/mwrap/grpc-tools/mcpp.toml @@ -3,12 +3,8 @@ name = "grpc-tools" version = "1.83.0.1" description = "Resolve the indexed gRPC plugin and host rule, and verify the built host binary" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"grpc.grpc-plugin" = { version = "1.83.0.1", tools = ["grpc_cpp_plugin"] } +grpc.grpc-plugin = { version = "1.83.0.1", tools = ["grpc_cpp_plugin"] } [build-dependencies] -"mcpplibs.grpcgen" = { version = "1.83.0.1", host-module = true } +mcpplibs.grpcgen = { version = "1.83.0.1", host-module = true } diff --git a/tests/mwrap/harfbuzz-shape/mcpp.toml b/tests/mwrap/harfbuzz-shape/mcpp.toml index 04ce4d49..7ae85132 100644 --- a/tests/mwrap/harfbuzz-shape/mcpp.toml +++ b/tests/mwrap/harfbuzz-shape/mcpp.toml @@ -3,11 +3,7 @@ name = "harfbuzz-shape" version = "14.3.0" description = "Consume the immutable HarfBuzz wrapper: shaping with a ligature and a kern pair, glyph names, an outline through draw functions, the FreeType integration over the FreeType wrapper's FT_Face, the macro mappings" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.harfbuzz" = "14.3.0" +mcpplibs.mwrap.harfbuzz = "14.3.0" # FT_Face for hb_ft_*: the FreeType wrapper's, the very type HarfBuzz's FreeType integration takes. -"mcpplibs.mwrap.freetype" = "2.13.3" +mcpplibs.mwrap.freetype = "2.13.3" diff --git a/tests/mwrap/imgui-headless/mcpp.toml b/tests/mwrap/imgui-headless/mcpp.toml index 9834e2f0..2219827a 100644 --- a/tests/mwrap/imgui-headless/mcpp.toml +++ b/tests/mwrap/imgui-headless/mcpp.toml @@ -3,9 +3,5 @@ name = "imgui-headless" version = "1.92.8" description = "Consume the immutable ImGui wrapper and render actual headless draw data" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.imgui" = "1.92.8" +mcpplibs.mwrap.imgui = "1.92.8" diff --git a/tests/mwrap/jolt-world/mcpp.toml b/tests/mwrap/jolt-world/mcpp.toml index 1bf785cf..59b723ba 100644 --- a/tests/mwrap/jolt-world/mcpp.toml +++ b/tests/mwrap/jolt-world/mcpp.toml @@ -3,10 +3,6 @@ name = "jolt-world" version = "5.6.0" description = "Consume the immutable Jolt Physics wrapper: a world of bodies stepped, queried, saved and restored to the same bits, with one worker and several" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.jolt = "5.6.0" diff --git a/tests/mwrap/libarchive-bundle/mcpp.toml b/tests/mwrap/libarchive-bundle/mcpp.toml index 4dc92eda..8a4a2507 100644 --- a/tests/mwrap/libarchive-bundle/mcpp.toml +++ b/tests/mwrap/libarchive-bundle/mcpp.toml @@ -3,9 +3,5 @@ name = "libarchive-bundle" version = "3.8.7" description = "Consume the immutable libarchive wrapper: tar.gz, zip and 7-Zip written to memory and read back with their formats detected, and entry metadata" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.libarchive" = "3.8.7" +mcpplibs.mwrap.libarchive = "3.8.7" diff --git a/tests/mwrap/libc-stdio/mcpp.toml b/tests/mwrap/libc-stdio/mcpp.toml index 0fae5b95..6dc8364a 100644 --- a/tests/mwrap/libc-stdio/mcpp.toml +++ b/tests/mwrap/libc-stdio/mcpp.toml @@ -3,9 +3,5 @@ name = "libc-stdio" version = "17.0.0" description = "Consume the immutable C standard library wrapper: stdout() and stderr(), errno() as strtol sets it, the stdio constants on a temporary file, and the side header's va_* and offsetof" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.libc" = "17.0.0" +mcpplibs.mwrap.libc = "17.0.0" diff --git a/tests/mwrap/libjpeg-turbo-decode/mcpp.toml b/tests/mwrap/libjpeg-turbo-decode/mcpp.toml index b4dd5ed8..074618c3 100644 --- a/tests/mwrap/libjpeg-turbo-decode/mcpp.toml +++ b/tests/mwrap/libjpeg-turbo-decode/mcpp.toml @@ -3,9 +3,5 @@ name = "libjpeg-turbo-decode" version = "3.2.1" description = "Consume the immutable libjpeg-turbo wrapper: a picture compressed and read back, its size and sampling, a scaled decode, a lossless turn, the adapted constants" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.libjpeg_turbo = "3.2.1" diff --git a/tests/mwrap/libpng-image/mcpp.toml b/tests/mwrap/libpng-image/mcpp.toml index f82ed8b7..ac2b99ba 100644 --- a/tests/mwrap/libpng-image/mcpp.toml +++ b/tests/mwrap/libpng-image/mcpp.toml @@ -3,9 +3,5 @@ name = "libpng-image" version = "1.6.43" description = "Consume the immutable libpng wrapper: a simplified-API round trip, a low-level read with transforms, the longjmp error path, the mapped macros" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.libpng" = "1.6.43" +mcpplibs.mwrap.libpng = "1.6.43" diff --git a/tests/mwrap/libvpx-webm/mcpp.toml b/tests/mwrap/libvpx-webm/mcpp.toml index b2252864..34cec80a 100644 --- a/tests/mwrap/libvpx-webm/mcpp.toml +++ b/tests/mwrap/libvpx-webm/mcpp.toml @@ -3,9 +3,5 @@ name = "libvpx-webm" version = "1.17.0" description = "Consume the immutable libvpx wrapper: VP9 frames encoded through the typed controls, muxed into a WebM with mkvmuxer, parsed back with mkvparser and decoded within a PSNR, the bytes the same twice; the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.libvpx" = "1.17.0" +mcpplibs.mwrap.libvpx = "1.17.0" diff --git a/tests/mwrap/libwebp-image/mcpp.toml b/tests/mwrap/libwebp-image/mcpp.toml index 67742803..c05d6b91 100644 --- a/tests/mwrap/libwebp-image/mcpp.toml +++ b/tests/mwrap/libwebp-image/mcpp.toml @@ -3,9 +3,5 @@ name = "libwebp-image" version = "1.5.0" description = "Consume the immutable libwebp wrapper with the demux and mux features: lossy and lossless RGBA round trips with alpha, the advanced API, an animation encoded and decoded frame by frame, the error paths, pinned bytes" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.libwebp" = { version = "1.5.0", features = ["demux", "mux"] } +mcpplibs.mwrap.libwebp = { version = "1.5.0", features = ["demux", "mux"] } diff --git a/tests/mwrap/llamacpp-cpu/mcpp.toml b/tests/mwrap/llamacpp-cpu/mcpp.toml index d2f2e10b..4a88ad55 100644 --- a/tests/mwrap/llamacpp-cpu/mcpp.toml +++ b/tests/mwrap/llamacpp-cpu/mcpp.toml @@ -3,9 +3,5 @@ name = "llamacpp-cpu" version = "b10069" description = "Install the immutable llama.cpp-m archive and exercise the CPU API" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies.mcpplibs.mwrap] llamacpp = "b10069" diff --git a/tests/mwrap/lua-embed/mcpp.toml b/tests/mwrap/lua-embed/mcpp.toml index c69217aa..9944adf2 100644 --- a/tests/mwrap/lua-embed/mcpp.toml +++ b/tests/mwrap/lua-embed/mcpp.toml @@ -3,9 +3,5 @@ name = "lua-embed" version = "5.4.7" description = "Consume the immutable Lua wrapper: a C function and a closure called from Lua, errors, userdata, the mapped macros" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.lua" = "5.4.7" +mcpplibs.mwrap.lua = "5.4.7" diff --git a/tests/mwrap/manifold-boolean/mcpp.toml b/tests/mwrap/manifold-boolean/mcpp.toml index e16ca04f..c8ac88d8 100644 --- a/tests/mwrap/manifold-boolean/mcpp.toml +++ b/tests/mwrap/manifold-boolean/mcpp.toml @@ -3,9 +3,5 @@ name = "manifold-boolean" version = "3.5.5.1" description = "Consume the immutable Manifold wrapper: booleans of solids and their volumes, a mesh in and out, the same mesh twice, an outline extruded and sliced" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.manifold = "3.5.5.1" diff --git a/tests/mwrap/md4c-render/mcpp.toml b/tests/mwrap/md4c-render/mcpp.toml index 139fcbbe..a362a0ac 100644 --- a/tests/mwrap/md4c-render/mcpp.toml +++ b/tests/mwrap/md4c-render/mcpp.toml @@ -3,9 +3,5 @@ name = "md4c-render" version = "0.5.3" description = "Consume the immutable md4c wrapper: parse with callbacks and render GFM to HTML" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.md4c" = "0.5.3" +mcpplibs.mwrap.md4c = "0.5.3" diff --git a/tests/mwrap/meshoptimizer-simplify/mcpp.toml b/tests/mwrap/meshoptimizer-simplify/mcpp.toml index bcb574aa..33bae47a 100644 --- a/tests/mwrap/meshoptimizer-simplify/mcpp.toml +++ b/tests/mwrap/meshoptimizer-simplify/mcpp.toml @@ -3,9 +3,5 @@ name = "meshoptimizer-simplify" version = "1.3" description = "Consume the immutable meshoptimizer wrapper: index a grid, order it for the vertex cache, simplify it, cut meshlets, and round-trip both codecs" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.meshoptimizer = "1.3.1" diff --git a/tests/mwrap/mimalloc-heap/mcpp.toml b/tests/mwrap/mimalloc-heap/mcpp.toml index 7009a224..d625957d 100644 --- a/tests/mwrap/mimalloc-heap/mcpp.toml +++ b/tests/mwrap/mimalloc-heap/mcpp.toml @@ -3,9 +3,5 @@ name = "mimalloc-heap" version = "3.6.1" description = "Consume the immutable mimalloc wrapper: private heaps visited and destroyed, aligned blocks, an STL container over mimalloc, options and statistics, threads that free each other's blocks, and the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.mimalloc" = "3.6.1" +mcpplibs.mwrap.mimalloc = "3.6.1" diff --git a/tests/mwrap/miniaudio-engine/mcpp.toml b/tests/mwrap/miniaudio-engine/mcpp.toml index 89b9e3f3..772078e8 100644 --- a/tests/mwrap/miniaudio-engine/mcpp.toml +++ b/tests/mwrap/miniaudio-engine/mcpp.toml @@ -3,9 +3,5 @@ name = "miniaudio-engine" version = "0.11.25" description = "Consume the immutable miniaudio wrapper: the engine without a device mixing a sound through a group, a tone encoded as WAV in memory and decoded back, the Null backend's device, the mapped macros, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.miniaudio" = "0.11.25" +mcpplibs.mwrap.miniaudio = "0.11.25" diff --git a/tests/mwrap/onnxruntime-cpu/mcpp.toml b/tests/mwrap/onnxruntime-cpu/mcpp.toml index 51d79f41..ec8fe56a 100644 --- a/tests/mwrap/onnxruntime-cpu/mcpp.toml +++ b/tests/mwrap/onnxruntime-cpu/mcpp.toml @@ -3,10 +3,6 @@ name = "onnxruntime-cpu" version = "1.25.1" description = "Install the immutable mwrap archive and execute CPU inference" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies."mcpplibs.mwrap"] onnxruntime = "1.25.1.1" diff --git a/tests/mwrap/onnxruntime-sdk/mcpp.toml b/tests/mwrap/onnxruntime-sdk/mcpp.toml index 6b0cdc67..1d88312e 100644 --- a/tests/mwrap/onnxruntime-sdk/mcpp.toml +++ b/tests/mwrap/onnxruntime-sdk/mcpp.toml @@ -3,10 +3,6 @@ name = "onnxruntime-sdk" version = "1.25.1" description = "Exercise the official ONNX Runtime SDK through the local index" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies.compat] onnxruntime = "1.25.1" diff --git a/tests/mwrap/opencv-cpu/mcpp.toml b/tests/mwrap/opencv-cpu/mcpp.toml index 36c548f7..f5e45296 100644 --- a/tests/mwrap/opencv-cpu/mcpp.toml +++ b/tests/mwrap/opencv-cpu/mcpp.toml @@ -3,9 +3,5 @@ name = "opencv-cpu" version = "5.0.0" description = "Install the OpenCV mwrap archive and run a generated image pipeline" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.opencv = { version = "5.0.0.1", features = ["imgproc", "imgcodecs-png", "imgcodecs-jpeg"] } diff --git a/tests/mwrap/opencv-webp/mcpp.toml b/tests/mwrap/opencv-webp/mcpp.toml index 1ebd31ea..2e977ce6 100644 --- a/tests/mwrap/opencv-webp/mcpp.toml +++ b/tests/mwrap/opencv-webp/mcpp.toml @@ -3,9 +3,5 @@ name = "opencv-webp" version = "5.0.0" description = "Consume the OpenCV archive with optional WebP image, animation and metadata support" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.opencv = { version = "5.0.0.1", features = ["imgcodecs-webp"] } diff --git a/tests/mwrap/openssl-tls/mcpp.toml b/tests/mwrap/openssl-tls/mcpp.toml index d1fdd0f9..30c194c5 100644 --- a/tests/mwrap/openssl-tls/mcpp.toml +++ b/tests/mwrap/openssl-tls/mcpp.toml @@ -3,9 +3,5 @@ name = "openssl-tls" version = "3.5.9" description = "Consume the immutable OpenSSL wrapper: SHA-256 and AES-256-GCM vectors, the error queue, a self-signed certificate and a TLS 1.3 handshake over memory BIOs" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.openssl = "3.5.9" diff --git a/tests/mwrap/opus-ogg/mcpp.toml b/tests/mwrap/opus-ogg/mcpp.toml index e032afaa..48f923f7 100644 --- a/tests/mwrap/opus-ogg/mcpp.toml +++ b/tests/mwrap/opus-ogg/mcpp.toml @@ -3,9 +3,5 @@ name = "opus-ogg" version = "1.6.1" description = "Consume the immutable Opus wrapper: a chord encoded with libopus, paged with libogg and read back with opusfile from memory (headers, tags, exact length, seeking), the typed CTL requests, a 5.1 multistream frame, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.opus" = "1.6.1" +mcpplibs.mwrap.opus = "1.6.1" diff --git a/tests/mwrap/pocketpy-embed/mcpp.toml b/tests/mwrap/pocketpy-embed/mcpp.toml index cdbbcd9c..b8c94400 100644 --- a/tests/mwrap/pocketpy-embed/mcpp.toml +++ b/tests/mwrap/pocketpy-embed/mcpp.toml @@ -3,9 +3,5 @@ name = "pocketpy-embed" version = "2.2.0" description = "Consume the immutable PocketPy wrapper: exec and eval read back, a dict walked, a C function called from Python, errors with messages and the VM going on, code re-run, the watchdog, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.pocketpy" = "2.2.0" +mcpplibs.mwrap.pocketpy = "2.2.0" diff --git a/tests/mwrap/protobuf-codegen/mcpp.toml b/tests/mwrap/protobuf-codegen/mcpp.toml index 2b94c71b..081eee7d 100644 --- a/tests/mwrap/protobuf-codegen/mcpp.toml +++ b/tests/mwrap/protobuf-codegen/mcpp.toml @@ -3,10 +3,6 @@ name = "protobuf-codegen" version = "35.1" description = "Consume the immutable Protocol Buffers wrapper's codegen: protoc during the build through the protogen rule, generated messages beside the module" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - # compat.protobuf has no protoc on Windows yet (its host-tool build fails # there), so codegen is linux/macOS. On Windows the member still builds the # indexed protogen rule on its own (mcpplibs.protogen), and its build program diff --git a/tests/mwrap/protobuf-message/mcpp.toml b/tests/mwrap/protobuf-message/mcpp.toml index 309b3a90..be755b34 100644 --- a/tests/mwrap/protobuf-message/mcpp.toml +++ b/tests/mwrap/protobuf-message/mcpp.toml @@ -3,9 +3,5 @@ name = "protobuf-message" version = "35.1" description = "Consume the immutable Protocol Buffers wrapper: a message type built at run time, its wire bytes, JSON and text formats, the well-known types" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.protobuf = "35.1" diff --git a/tests/mwrap/quickjs-embed/mcpp.toml b/tests/mwrap/quickjs-embed/mcpp.toml index ccfceb9a..d019d215 100644 --- a/tests/mwrap/quickjs-embed/mcpp.toml +++ b/tests/mwrap/quickjs-embed/mcpp.toml @@ -3,9 +3,5 @@ name = "quickjs-embed" version = "0.17.0" description = "Consume the immutable QuickJS-ng wrapper: a C function and a property table called from JavaScript, exceptions, promises, a class" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.quickjs_ng" = "0.17.0" +mcpplibs.mwrap.quickjs_ng = "0.17.0" diff --git a/tests/mwrap/recastnavigation-path/mcpp.toml b/tests/mwrap/recastnavigation-path/mcpp.toml index 5b4a8897..3ecf2549 100644 --- a/tests/mwrap/recastnavigation-path/mcpp.toml +++ b/tests/mwrap/recastnavigation-path/mcpp.toml @@ -3,10 +3,6 @@ name = "recastnavigation-path" version = "1.6.0.2" description = "Consume the immutable Recast & Detour wrapper: a navigation mesh built from triangles, a path around a wall, a crowd walked through a doorway; the mesh's bytes and the crowd's places pinned" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.recastnavigation = "1.6.0.2" diff --git a/tests/mwrap/sdl3-headless/mcpp.toml b/tests/mwrap/sdl3-headless/mcpp.toml index 86ecbb3e..37fc6b5c 100644 --- a/tests/mwrap/sdl3-headless/mcpp.toml +++ b/tests/mwrap/sdl3-headless/mcpp.toml @@ -3,9 +3,5 @@ name = "sdl3-headless" version = "3.4.18" description = "Consume the immutable SDL3 wrapper headless: events, properties, a surface, the software renderer on the dummy driver, an audio stream, the mapped macros" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.sdl3" = "3.4.18" +mcpplibs.mwrap.sdl3 = "3.4.18" diff --git a/tests/mwrap/sheenbidi-bidi/mcpp.toml b/tests/mwrap/sheenbidi-bidi/mcpp.toml index 5e0779bb..643f7c34 100644 --- a/tests/mwrap/sheenbidi-bidi/mcpp.toml +++ b/tests/mwrap/sheenbidi-bidi/mcpp.toml @@ -3,9 +3,5 @@ name = "sheenbidi-bidi" version = "3.0.0" description = "Consume the immutable SheenBidi wrapper: UAX #9's bracket-pair example in an RTL paragraph, a line's runs in visual order, the mirror and script locators, the mapped macros and enumerators, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.sheenbidi" = "3.0.0" +mcpplibs.mwrap.sheenbidi = "3.0.0" diff --git a/tests/mwrap/slint-rule/mcpp.toml b/tests/mwrap/slint-rule/mcpp.toml index bcc24292..d66b5fb3 100644 --- a/tests/mwrap/slint-rule/mcpp.toml +++ b/tests/mwrap/slint-rule/mcpp.toml @@ -8,10 +8,6 @@ standard = "c++23" modules = true import_std = false -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] # The SDK the rule drives: slint-compiler comes with it. compat.slint = "1.19.0" diff --git a/tests/mwrap/slint-ui/mcpp.toml b/tests/mwrap/slint-ui/mcpp.toml index 1bc03d33..b75e692b 100644 --- a/tests/mwrap/slint-ui/mcpp.toml +++ b/tests/mwrap/slint-ui/mcpp.toml @@ -8,10 +8,6 @@ standard = "c++23" modules = true import_std = false -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] # The wrapper re-exports the build rule (module mcpplibs.mplugin.slint) and the # SDK: this is the whole dependency list. diff --git a/tests/mwrap/wuffs-decode/mcpp.toml b/tests/mwrap/wuffs-decode/mcpp.toml index 45859b3a..6a65c566 100644 --- a/tests/mwrap/wuffs-decode/mcpp.toml +++ b/tests/mwrap/wuffs-decode/mcpp.toml @@ -3,9 +3,5 @@ name = "wuffs-decode" version = "0.3.6" description = "Consume the immutable Wuffs wrapper: a PNG and a GIF decoded pixel by pixel, gzip inflated by the C API and the adapted static inline helpers, JSON walked by wuffs_aux, a truncated image refused, the mapped macros, the side header beside the import" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] mcpplibs.mwrap.wuffs = "0.3.6" diff --git a/tests/mwrap/xxhash-digest/mcpp.toml b/tests/mwrap/xxhash-digest/mcpp.toml index d7bf3725..0448f251 100644 --- a/tests/mwrap/xxhash-digest/mcpp.toml +++ b/tests/mwrap/xxhash-digest/mcpp.toml @@ -3,9 +3,5 @@ name = "xxhash-digest" version = "0.8.3" description = "Consume the immutable xxHash wrapper: the published hashes of the empty input, streaming equal to one call, and the canonical form" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.xxhash" = "0.8.3" +mcpplibs.mwrap.xxhash = "0.8.3" diff --git a/tests/mwrap/xz-pack/mcpp.toml b/tests/mwrap/xz-pack/mcpp.toml index fef9eed7..50a42e5d 100644 --- a/tests/mwrap/xz-pack/mcpp.toml +++ b/tests/mwrap/xz-pack/mcpp.toml @@ -3,9 +3,5 @@ name = "xz-pack" version = "5.8.3" description = "Consume the immutable liblzma wrapper: an .xz stream through the side header's LZMA_STREAM_INIT, a BCJ filter chain, the .lzma format, and the published CRC-64" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.xz" = "5.8.3.1" +mcpplibs.mwrap.xz = "5.8.3.1" diff --git a/tests/mwrap/zlib-compress/mcpp.toml b/tests/mwrap/zlib-compress/mcpp.toml index dcb43d34..c3ee6f59 100644 --- a/tests/mwrap/zlib-compress/mcpp.toml +++ b/tests/mwrap/zlib-compress/mcpp.toml @@ -3,9 +3,5 @@ name = "zlib-compress" version = "1.3.2" description = "Consume the immutable zlib wrapper: a one-call round trip, an inflate stream through the side header's inflateInit, a gzip file, and the published CRC-32" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.zlib" = "1.3.2" +mcpplibs.mwrap.zlib = "1.3.2" diff --git a/tests/mwrap/zstd-squeeze/mcpp.toml b/tests/mwrap/zstd-squeeze/mcpp.toml index ce8165e6..e3e3fe22 100644 --- a/tests/mwrap/zstd-squeeze/mcpp.toml +++ b/tests/mwrap/zstd-squeeze/mcpp.toml @@ -3,9 +3,5 @@ name = "zstd-squeeze" version = "1.5.7" description = "Consume the immutable Zstandard wrapper: a one-shot round trip with the frame's content size, a stream, a damaged checksum refused, and the side header's ZSTD_COMPRESSBOUND" -[indices] -# Use the complete candidate built-in index prepared by tests/run_members.sh. -# An explicit empty table overrides the legacy workspace redirect. - [dependencies] -"mcpplibs.mwrap.zstd" = "1.5.7" +mcpplibs.mwrap.zstd = "1.5.7" diff --git a/tests/openkal/pins.toml b/tests/openkal/pins.toml index 460b239d..97ff79e6 100644 --- a/tests/openkal/pins.toml +++ b/tests/openkal/pins.toml @@ -18,6 +18,9 @@ toolchain = "llvm@22.1.8" # index requires mcpp >= 2026.9.18.1 but this is mcpp 2026.9.17.3 [E0006]" # before a single line of the member's own source is read. # +# 2026-11-22: measurement engine 2026.11.22.1 (its built-in platform is +# openkal-platform 0.31.2) matches all CI workflows. The runtime and toolchain +# pins below and the index client floor are unchanged. # 2026-11-18: measurement engine 2026.11.18.1 (its built-in platform is # openkal-platform 0.29.2) matches all CI workflows, which moved to it in #822. # 2026-11-16: measurement engine 2026.11.16.1 (its built-in platform is @@ -161,7 +164,7 @@ toolchain = "llvm@22.1.8" # openkal-musl 0.16.0 and openkal-llvm-runtime 0.12.0), because a pin that # moves onto an unreachable or divergent asset fails every member at once and # reports it as a compatibility result. -mcpp = "2026.11.18.1" +mcpp = "2026.11.22.1" # The Windows target is named for the C environment the graph presents there, # which is musl's (openkal-musl declares `[c-abi] presents = "posix"`), not diff --git a/tests/test_prepare_mwrap_indices.py b/tests/test_prepare_mwrap_indices.py index 8f4f0eb5..3fa35b55 100644 --- a/tests/test_prepare_mwrap_indices.py +++ b/tests/test_prepare_mwrap_indices.py @@ -10,16 +10,20 @@ class NamespaceViews(unittest.TestCase): - def test_workspace_members_override_project_aliases(self): + def test_mwrap_members_take_only_the_candidate_index(self): + # An mwrap member resolves from the complete candidate index in its test home; an index it + # or the workspace stated beside it (this checkout) would make each package two candidates. root = Path(__file__).resolve().parents[1] - workspace = tomllib.loads((root / "mcpp.toml").read_text())["workspace"]["members"] + workspace_manifest = tomllib.loads((root / "mcpp.toml").read_text()) + self.assertNotIn("indices", workspace_manifest) + self.assertNotIn("indices", workspace_manifest.get("workspace", {})) + workspace = workspace_manifest["workspace"]["members"] members = [root / member / "mcpp.toml" for member in workspace if member.startswith("tests/mwrap/")] self.assertTrue(members) for manifest in members: with self.subTest(member=manifest.parent.name): parsed = tomllib.loads(manifest.read_text()) - self.assertIn("indices", parsed) - self.assertEqual(parsed["indices"], {}) + self.assertFalse(parsed.get("indices")) def test_rebuild_removes_cross_namespace_candidates(self): with tempfile.TemporaryDirectory() as directory: