Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ round-trip on every CI run over the same library.
## Getting started

```sh
mcpp new squeeze --template mcpplibs.mwrap.zstd@1.5.7
mcpp new squeeze --template mcpplibs.mwrap.zstd@1.5.7.1
cd squeeze
mcpp run
```
Expand All @@ -37,7 +37,7 @@ restores it and prints the sizes.

```toml
[dependencies]
"mcpplibs.mwrap.zstd" = "1.5.7"
mcpplibs.mwrap.zstd = "1.5.7.1"
```

```cpp
Expand Down
4 changes: 2 additions & 2 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ C++ 常量。每次 CI 都在同一份库上运行上游自己的示例并完成
## 快速开始

```sh
mcpp new squeeze --template mcpplibs.mwrap.zstd@1.5.7
mcpp new squeeze --template mcpplibs.mwrap.zstd@1.5.7.1
cd squeeze
mcpp run
```
Expand All @@ -33,7 +33,7 @@ mcpp run

```toml
[dependencies]
"mcpplibs.mwrap.zstd" = "1.5.7"
mcpplibs.mwrap.zstd = "1.5.7.1"
```

```cpp
Expand Down
2 changes: 1 addition & 1 deletion mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[package]
namespace = "mcpplibs.mwrap"
name = "zstd"
version = "1.5.7"
version = "1.5.7.1"
description = "Zstandard 1.5.7 C++ modules for mcpp (import mcpplibs.mwrap.zstd;): one-shot and streaming compression and decompression, parameters, dictionaries and error codes over compat.zstd, with the constants of zstd.h as C++ constants"
license = "Apache-2.0"
authors = ["mcpp-community"]
Expand Down
2 changes: 1 addition & 1 deletion templates/squeeze/mcpp.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ kind = "bin"
main = "src/main.cpp"

[dependencies]
"{{self.name}}" = "{{self.version}}"
{{self.name}} = "{{self.version}}"
11 changes: 7 additions & 4 deletions tools/test_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,20 @@ 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())
if options.get("features"):
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()
Expand Down
Loading