aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-03-03 14:33:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-03-03 15:25:32 +0200
commit183329b89ddf810e2df5c250ae5b97d8ebcbba74 (patch)
treebf1e174ffe0929a9ec78ac642b351cbc5a23b78b /build2/dist
parentbcb5045dff9e87decbad3a785eb1fe42f4fc1410 (diff)
Fix cli distribution via group
Diffstat (limited to 'build2/dist')
-rw-r--r--build2/dist/init.cxx5
-rw-r--r--build2/dist/operation.cxx4
-rw-r--r--build2/dist/rule7
3 files changed, 12 insertions, 4 deletions
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<target>(dist_id, test_id)
- // taking precedence.
+ // Register our wildcard rule. Do it explicitly for the alias to prevent
+ // something like insert<target>(dist_id, test_id) taking precedence.
//
rs.rules.insert<target> (dist_id, 0, "dist", rule_);
rs.rules.insert<alias> (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: