aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-07-10 07:08:08 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-07-10 07:08:08 +0200
commitfefcedab45d3e35782943faeee49478b5737c424 (patch)
treea484f4c070dd2f70657e92dcfda8907667d839c2
parentfeed07e16ff73c5f0b25f2ceb4c08177b5c0e3af (diff)
Tweak rule names
-rw-r--r--libbuild2/install/init.cxx2
-rw-r--r--libbuild2/rule-map.hxx3
-rw-r--r--libbuild2/test/init.cxx2
3 files changed, 4 insertions, 3 deletions
diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index 31e0f7a..e8ca982 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -339,7 +339,7 @@ namespace build2
// operation, similar to update.
//
rs.global_scope ().insert_rule<mtime_target> (
- perform_install_id, "file", file_rule::instance);
+ perform_install_id, "install.file", file_rule::instance);
}
// Configuration.
diff --git a/libbuild2/rule-map.hxx b/libbuild2/rule-map.hxx
index 2b9a145..df59548 100644
--- a/libbuild2/rule-map.hxx
+++ b/libbuild2/rule-map.hxx
@@ -64,12 +64,13 @@ namespace build2
// allocation for the common cases since most rules will be registered
// for perform, at least on non-root scopes.
//
+ // Note: duplicate insertions (e.g., to global scope rule map) are ignored.
+ //
// @@ Redo using small_vector?
//
class rule_map
{
public:
-
template <typename T>
void
insert (action_id a, const char* hint, const rule& r)
diff --git a/libbuild2/test/init.cxx b/libbuild2/test/init.cxx
index 02d0a42..b6b18d9 100644
--- a/libbuild2/test/init.cxx
+++ b/libbuild2/test/init.cxx
@@ -219,7 +219,7 @@ namespace build2
// similar to update.
//
rs.global_scope ().insert_rule<mtime_target> (
- perform_test_id, "file", file_rule::instance);
+ perform_test_id, "test.file", file_rule::instance);
}
return true;