From ead1200b6438677b06e37512b2f2e6d22f4a06bd Mon Sep 17 00:00:00 2001 From: Sunrisepeak Date: Sun, 22 Nov 2026 19:28:08 +0900 Subject: [PATCH] mwrap 14.3.0.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. The manifests the repository builds itself name the package by the unquoted key too (examples/hb-shape/mcpp.toml). --- README.md | 4 ++-- README.zh.md | 4 ++-- examples/hb-shape/mcpp.toml | 2 +- mcpp.toml | 2 +- templates/shape/mcpp.toml.in | 2 +- tools/test_template.py | 11 +++++++---- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 06697b3..7fe884a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ HarfBuzz's own shaping suites pass on every CI run, on a port of upstream's ## Getting started ```sh -mcpp new banner --template mcpplibs.mwrap.harfbuzz@14.3.0 +mcpp new banner --template mcpplibs.mwrap.harfbuzz@14.3.0.1 cd banner mcpp run mcpp run -- /path/to/font.ttf "Text" -liga,-kern @@ -40,7 +40,7 @@ terminal from the glyph outlines. Given a font file, it shapes any text. ```toml [dependencies] -"mcpplibs.mwrap.harfbuzz" = "14.3.0" +mcpplibs.mwrap.harfbuzz = "14.3.0.1" ``` ```cpp diff --git a/README.zh.md b/README.zh.md index 59b539c..4012972 100644 --- a/README.zh.md +++ b/README.zh.md @@ -28,7 +28,7 @@ ## 快速开始 ```sh -mcpp new banner --template mcpplibs.mwrap.harfbuzz@14.3.0 +mcpp new banner --template mcpplibs.mwrap.harfbuzz@14.3.0.1 cd banner mcpp run mcpp run -- /path/to/font.ttf "Text" -liga,-kern @@ -39,7 +39,7 @@ mcpp run -- /path/to/font.ttf "Text" -liga,-kern ```toml [dependencies] -"mcpplibs.mwrap.harfbuzz" = "14.3.0" +mcpplibs.mwrap.harfbuzz = "14.3.0.1" ``` ```cpp diff --git a/examples/hb-shape/mcpp.toml b/examples/hb-shape/mcpp.toml index abd339d..bec84be 100644 --- a/examples/hb-shape/mcpp.toml +++ b/examples/hb-shape/mcpp.toml @@ -9,4 +9,4 @@ kind = "bin" main = "src/main.cpp" [dependencies] -"mcpplibs.mwrap.harfbuzz" = { path = "../.." } +mcpplibs.mwrap.harfbuzz = { path = "../.." } diff --git a/mcpp.toml b/mcpp.toml index 877f071..5dad62d 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -2,7 +2,7 @@ [package] namespace = "mcpplibs.mwrap" name = "harfbuzz" -version = "14.3.0" +version = "14.3.0.1" description = "HarfBuzz 14.3.0 C++ modules for mcpp (import mcpplibs.mwrap.harfbuzz;): the API of hb.h, hb-ot.h, hb-aat.h and hb-ft.h over compat.harfbuzz, the C++ helpers of hb-cplusplus.hh, its macros as constants and constexpr functions" license = "Apache-2.0" authors = ["mcpp-community"] diff --git a/templates/shape/mcpp.toml.in b/templates/shape/mcpp.toml.in index a637560..43c2cea 100644 --- a/templates/shape/mcpp.toml.in +++ b/templates/shape/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()