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 @@ -26,7 +26,7 @@ a port written against the module, with every outcome equal to upstream's.
## Getting started

```sh
mcpp new pictures --template mcpplibs.mwrap.libpng@1.6.43
mcpp new pictures --template mcpplibs.mwrap.libpng@1.6.43.1
cd pictures
mcpp run
```
Expand All @@ -37,7 +37,7 @@ it back pixel for pixel, and describes it with the low-level reader;

```toml
[dependencies]
"mcpplibs.mwrap.libpng" = "1.6.43"
mcpplibs.mwrap.libpng = "1.6.43.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 @@ -25,7 +25,7 @@ constexpr 函数,把构建选项映射成 `constexpr bool`。每次 CI 都会
## 快速开始

```sh
mcpp new pictures --template mcpplibs.mwrap.libpng@1.6.43
mcpp new pictures --template mcpplibs.mwrap.libpng@1.6.43.1
cd pictures
mcpp run
```
Expand All @@ -35,7 +35,7 @@ mcpp run

```toml
[dependencies]
"mcpplibs.mwrap.libpng" = "1.6.43"
mcpplibs.mwrap.libpng = "1.6.43.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 = "libpng"
version = "1.6.43"
version = "1.6.43.1"
description = "libpng 1.6.43 C++ modules for mcpp (import mcpplibs.mwrap.libpng;): the API of png.h over compat.libpng, its macros as constants and constexpr functions, its build options as constexpr bool"
license = "Apache-2.0"
authors = ["mcpp-community"]
Expand Down
2 changes: 1 addition & 1 deletion templates/image/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