aboutsummaryrefslogtreecommitdiff
path: root/build/dist/module.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-12-03 17:20:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-12-03 17:20:15 +0200
commit6298f309bddaf3f279a724034e2d1d3ce58e0e1a (patch)
treec41d46641fbc8789cb851a9f08649b0381c96b64 /build/dist/module.cxx
parente6126827072270ab41efd91741f4c22f3eac4bc8 (diff)
Clean up rule names
Diffstat (limited to 'build/dist/module.cxx')
-rw-r--r--build/dist/module.cxx40
1 files changed, 21 insertions, 19 deletions
diff --git a/build/dist/module.cxx b/build/dist/module.cxx
index a624c20..f0a446b 100644
--- a/build/dist/module.cxx
+++ b/build/dist/module.cxx
@@ -44,37 +44,39 @@ namespace build
const dir_path& out_root (r.out_path ());
level5 ([&]{trace << "for " << out_root;});
- // Register meta-operation.
- //
- r.meta_operations.insert (dist_id, dist);
-
- // Register our wildcard rule. Do it explicitly for the alias
- // to prevent something like insert<target>(dist_id, test_id)
- // taking precedence.
- //
- r.rules.insert<target> (dist_id, 0, "dist", rule_);
- r.rules.insert<alias> (dist_id, 0, "alias", rule_);
-
// Enter module variables.
//
if (first)
{
- var_pool.find ("dist", bool_type);
+ auto& v (var_pool);
+
+ v.find ("dist", bool_type);
- var_pool.find ("dist.package", string_type);
+ v.find ("dist.package", string_type);
- var_pool.find ("dist.root", dir_path_type);
- var_pool.find ("config.dist.root", dir_path_type);
+ v.find ("dist.root", dir_path_type);
+ v.find ("config.dist.root", dir_path_type);
//@@ VAR type
//
- var_pool.find ("dist.cmd", string_type);
- var_pool.find ("config.dist.cmd", string_type);
+ v.find ("dist.cmd", string_type);
+ v.find ("config.dist.cmd", string_type);
- var_pool.find ("dist.archives", strings_type);
- var_pool.find ("config.dist.archives", strings_type);
+ v.find ("dist.archives", strings_type);
+ v.find ("config.dist.archives", strings_type);
}
+ // Register meta-operation.
+ //
+ r.meta_operations.insert (dist_id, dist);
+
+ // Register our wildcard rule. Do it explicitly for the alias
+ // to prevent something like insert<target>(dist_id, test_id)
+ // taking precedence.
+ //
+ r.rules.insert<target> (dist_id, 0, "dist", rule_);
+ r.rules.insert<alias> (dist_id, 0, "dist.alias", rule_);
+
// Configuration.
//
// Note that we don't use any defaults for root -- the location