diff --git a/README.md b/README.md index 74c744f..838cc8a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ test passes its 49948 vectors on every CI run over the same library. ## Getting started ```sh -mcpp new digest --template mcpplibs.mwrap.xxhash@0.8.3 +mcpp new digest --template mcpplibs.mwrap.xxhash@0.8.3.1 cd digest mcpp run ``` @@ -36,7 +36,7 @@ file, and checks that streaming gives the same XXH3-64. ```toml [dependencies] -"mcpplibs.mwrap.xxhash" = "0.8.3" +mcpplibs.mwrap.xxhash = "0.8.3.1" ``` ```cpp diff --git a/README.zh.md b/README.zh.md index 30d4396..a44f9eb 100644 --- a/README.zh.md +++ b/README.zh.md @@ -23,7 +23,7 @@ C++ 常量。每次 CI 都在同一份库上运行上游自己的 sanity 测试 ## 快速开始 ```sh -mcpp new digest --template mcpplibs.mwrap.xxhash@0.8.3 +mcpp new digest --template mcpplibs.mwrap.xxhash@0.8.3.1 cd digest mcpp run ``` @@ -32,7 +32,7 @@ mcpp run ```toml [dependencies] -"mcpplibs.mwrap.xxhash" = "0.8.3" +mcpplibs.mwrap.xxhash = "0.8.3.1" ``` ```cpp diff --git a/mcpp.toml b/mcpp.toml index 27ca2fe..64b8f94 100644 --- a/mcpp.toml +++ b/mcpp.toml @@ -2,7 +2,7 @@ [package] namespace = "mcpplibs.mwrap" name = "xxhash" -version = "0.8.3" +version = "0.8.3.1" description = "xxHash 0.8.3 C++ modules for mcpp (import mcpplibs.mwrap.xxhash;): XXH32, XXH64 and XXH3 (64 and 128 bits), one-shot and streaming, with canonical forms, over compat.xxhash" license = "Apache-2.0" authors = ["mcpp-community"] diff --git a/templates/digest/mcpp.toml.in b/templates/digest/mcpp.toml.in index a637560..43c2cea 100644 --- a/templates/digest/mcpp.toml.in +++ b/templates/digest/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()