diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-04-06 11:26:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-04-06 13:51:56 +0200 |
| commit | 76be0a35f6c37cda7ba65530330f1ac246fb52a8 (patch) | |
| tree | f613ceafcf6c7208984d4536653061c4e0c23be7 /libbuild2/version | |
| parent | 0a9dd0c7d31cbba2170fdfda4b747a1fe5ce665a (diff) | |
Add support for rule hints
A rule hint is a target attribute, for example:
[rule_hint=cxx] exe{hello}: c{hello}
Rule hints can be used to resolve ambiguity when multiple rules match the same
target as well as to override an unambiguous match.
Diffstat (limited to 'libbuild2/version')
| -rw-r--r-- | libbuild2/version/init.cxx | 2 | ||||
| -rw-r--r-- | libbuild2/version/rule.cxx | 6 | ||||
| -rw-r--r-- | libbuild2/version/rule.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/version/init.cxx b/libbuild2/version/init.cxx index abcb728..b3657bc 100644 --- a/libbuild2/version/init.cxx +++ b/libbuild2/version/init.cxx @@ -390,7 +390,7 @@ namespace build2 if (cast_false<bool> (rs["install.booted"])) { rs.insert_rule<manifest> ( - perform_install_id, "version.manifest", manifest_install_rule_); + perform_install_id, "version.install", manifest_install_rule_); } return true; diff --git a/libbuild2/version/rule.cxx b/libbuild2/version/rule.cxx index 3da69cc..ad26da4 100644 --- a/libbuild2/version/rule.cxx +++ b/libbuild2/version/rule.cxx @@ -47,7 +47,7 @@ namespace build2 // in_rule // bool in_rule:: - match (action a, target& xt, const string&) const + match (action a, target& xt) const { tracer trace ("version::in_rule::match"); @@ -302,7 +302,7 @@ namespace build2 // manifest_install_rule // bool manifest_install_rule:: - match (action a, target& t, const string&) const + match (action a, target& t) const { // We only match project's manifest. // @@ -315,7 +315,7 @@ namespace build2 if (s.root_scope () != &s || s.src_path () != t.dir) return false; - return file_rule::match (a, t, ""); + return file_rule::match (a, t); } auto_rmfile manifest_install_rule:: diff --git a/libbuild2/version/rule.hxx b/libbuild2/version/rule.hxx index c174f40..55b4aee 100644 --- a/libbuild2/version/rule.hxx +++ b/libbuild2/version/rule.hxx @@ -23,7 +23,7 @@ namespace build2 in_rule (): rule ("version.in 2", "version.in") {} virtual bool - match (action, target&, const string&) const override; + match (action, target&) const override; virtual string lookup (const location&, @@ -42,7 +42,7 @@ namespace build2 manifest_install_rule () {} virtual bool - match (action, target&, const string&) const override; + match (action, target&) const override; virtual auto_rmfile install_pre (const file&, const install_dir&) const override; |