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 @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/hb-shape/mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ kind = "bin"
main = "src/main.cpp"

[dependencies]
"mcpplibs.mwrap.harfbuzz" = { path = "../.." }
mcpplibs.mwrap.harfbuzz = { 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 = "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"]
Expand Down
2 changes: 1 addition & 1 deletion templates/shape/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