From 2dadb6c5e3f60d450d00ff30f46b506cd383093b Mon Sep 17 00:00:00 2001 From: Sunrisepeak Date: Sun, 22 Nov 2026 17:57:10 +0900 Subject: [PATCH] mwrap 1.3.2.1: the template writes its dependency selector unquoted (mcpp 2026.11.8.1 deprecates the quoted key) tools/test_template.py reads the unquoted key as the nested tables TOML makes of it, and requires that spelling in the rendered manifest. --- README.md | 4 ++-- README.zh.md | 4 ++-- mcpp.toml | 2 +- templates/compress/mcpp.toml.in | 2 +- tools/test_template.py | 11 +++++++---- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1c6b3aa..84df4b3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ library. ## Getting started ```sh -mcpp new compress --template mcpplibs.mwrap.zlib@1.3.2 +mcpp new compress --template mcpplibs.mwrap.zlib@1.3.2.1 cd compress mcpp run ``` @@ -38,7 +38,7 @@ inflate stream, and prints both sizes and the CRC-32. ```toml [dependencies] -"mcpplibs.mwrap.zlib" = "1.3.2" +mcpplibs.mwrap.zlib = "1.3.2.1" ``` ```cpp diff --git a/README.zh.md b/README.zh.md index e5316fa..53d7490 100644 --- a/README.zh.md +++ b/README.zh.md @@ -24,7 +24,7 @@ ## 快速开始 ```sh -mcpp new compress --template mcpplibs.mwrap.zlib@1.3.2 +mcpp new compress --template mcpplibs.mwrap.zlib@1.3.2.1 cd compress mcpp run ``` @@ -33,7 +33,7 @@ mcpp run ```toml [dependencies] -"mcpplibs.mwrap.zlib" = "1.3.2" +mcpplibs.mwrap.zlib = "1.3.2.1" ``` ```cpp diff --git a/mcpp.toml b/mcpp.toml index 5c82b10..a83ec2b 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -2,7 +2,7 @@ [package] namespace = "mcpplibs.mwrap" name = "zlib" -version = "1.3.2" +version = "1.3.2.1" description = "zlib 1.3.2 C++ modules for mcpp (import mcpplibs.mwrap.zlib;): deflate and inflate streams, the one-call utility functions, gzip files and checksums over compat.zlib, with the constants of zlib.h as C++ constants" license = "Apache-2.0" authors = ["mcpp-community"] diff --git a/templates/compress/mcpp.toml.in b/templates/compress/mcpp.toml.in index a637560..43c2cea 100644 --- a/templates/compress/mcpp.toml.in +++ b/templates/compress/mcpp.toml.in @@ -7,4 +7,4 @@ kind = "bin" main = "src/main.cpp" [dependencies] -"{{self.name}}" = "{{self.version}}" +{{self.name}} = "{{self.version}}" diff --git a/tools/test_template.py b/tools/test_template.py index 81ea805..07f1ca6 100644 --- a/tools/test_template.py +++ b/tools/test_template.py @@ -48,7 +48,10 @@ def main(): project = temporary / "quickstart" manifest = project / "mcpp.toml" text = manifest.read_text() - dependency = tomllib.loads(text)["dependencies"][identity] + # The key is unquoted, so TOML reads it as one table per segment. + dependency = tomllib.loads(text)["dependencies"] + for segment in identity.split("."): + dependency = dependency[segment] options = {"version": dependency} if isinstance(dependency, str) else dependency assert options["version"] == version, options replacement = '{ path = ' + json.dumps(package.as_posix()) @@ -56,9 +59,9 @@ def main(): replacement += ', features = ' + json.dumps(options["features"]) replacement += ' }' lines = text.splitlines() - matches = [i for i, line in enumerate(lines) if line.startswith(json.dumps(identity) + " =")] - assert len(matches) == 1, "Expected exactly one qualified dependency from self.name" - lines[matches[0]] = json.dumps(identity) + " = " + replacement + matches = [i for i, line in enumerate(lines) if line.startswith(identity + " =")] + assert len(matches) == 1, "Expected exactly one unquoted qualified dependency from self.name" + lines[matches[0]] = identity + " = " + replacement manifest.write_text("\n".join(lines) + "\n") if args.index: candidate_index = args.index.resolve()