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 @@ -35,7 +35,7 @@ CI run the files written are byte-identical to upstream's own `vpxenc`, and
## Getting started

```sh
mcpp new clip --template mcpplibs.mwrap.libvpx@1.17.0
mcpp new clip --template mcpplibs.mwrap.libvpx@1.17.0.1
cd clip
mcpp run -- clip.webm
```
Expand All @@ -46,7 +46,7 @@ size and the worst PSNR; given a file name it also writes the WebM.

```toml
[dependencies]
"mcpplibs.mwrap.libvpx" = "1.17.0"
mcpplibs.mwrap.libvpx = "1.17.0.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 @@ -31,7 +31,7 @@ WebM(所有浏览器都能播放的容器)。上游 API 保持不变:`vpx_
## 快速开始

```sh
mcpp new clip --template mcpplibs.mwrap.libvpx@1.17.0
mcpp new clip --template mcpplibs.mwrap.libvpx@1.17.0.1
cd clip
mcpp run -- clip.webm
```
Expand All @@ -41,7 +41,7 @@ PSNR;给出文件名时同时写出 WebM。

```toml
[dependencies]
"mcpplibs.mwrap.libvpx" = "1.17.0"
mcpplibs.mwrap.libvpx = "1.17.0.1"
```

```cpp
Expand Down
2 changes: 1 addition & 1 deletion examples/vpxwebm/mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ kind = "bin"
main = "src/main.cpp"

[dependencies]
"mcpplibs.mwrap.libvpx" = { path = "../.." }
mcpplibs.mwrap.libvpx = { path = "../.." }

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 = "libvpx"
version = "1.17.0"
version = "1.17.0.1"
description = "libvpx C++ modules for mcpp (import mcpplibs.mwrap.libvpx;): the libvpx 1.17.0 VP9 codec (encoder and decoder) and the libwebm 1.0.0.32 WebM container (mkvmuxer and mkvparser), over compat.libvpx and compat.libwebm; the typed controls adapted, the macros as constants and functions"
license = "Apache-2.0"
authors = ["mcpp-community"]
Expand Down
2 changes: 1 addition & 1 deletion templates/webm/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