From 183329b89ddf810e2df5c250ae5b97d8ebcbba74 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 3 Mar 2017 14:33:54 +0200 Subject: Fix cli distribution via group --- build2/dist/init.cxx | 5 ++--- build2/dist/operation.cxx | 4 +++- build2/dist/rule | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'build2/dist') diff --git a/build2/dist/init.cxx b/build2/dist/init.cxx index 98f8a9a..be7b381 100644 --- a/build2/dist/init.cxx +++ b/build2/dist/init.cxx @@ -84,9 +84,8 @@ namespace build2 assert (config_hints.empty ()); // We don't known any hints. - // Register our wildcard rule. Do it explicitly for the alias - // to prevent something like insert(dist_id, test_id) - // taking precedence. + // Register our wildcard rule. Do it explicitly for the alias to prevent + // something like insert(dist_id, test_id) taking precedence. // rs.rules.insert (dist_id, 0, "dist", rule_); rs.rules.insert (dist_id, 0, "dist.alias", rule_); diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx index 6b50c14..027452f 100644 --- a/build2/dist/operation.cxx +++ b/build2/dist/operation.cxx @@ -123,7 +123,9 @@ namespace build2 // set_current_oif (*oif); - match (action (dist_id, oif->id), ts); // Standard (perform) match. + // Use standard (perform) match. + // + match (action (dist_id, oif->id), ts); } } diff --git a/build2/dist/rule b/build2/dist/rule index db8e731..0a5cc3a 100644 --- a/build2/dist/rule +++ b/build2/dist/rule @@ -16,6 +16,13 @@ namespace build2 { namespace dist { + // This is the default rule that simply matches all the prerequisites. + // + // A custom rule (usually the same as perform_update) may be necessary to + // enter ad hoc prerequisites (like generated test input/output) or + // establishing group links (so that we see the dist variable set on a + // group). + // class rule: public build2::rule { public: -- cgit v1.1