aboutsummaryrefslogtreecommitdiff
path: root/build2/dist/rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-06-28 09:44:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-06-28 09:44:15 +0200
commit3cc5e3bd441fc9d18fece3d9e99fae75c78438e7 (patch)
treea9a08c453370847e0d352d47e19fbfcb7cc757ef /build2/dist/rule.cxx
parentc0f72d47fc25981dcc1f55e12dfa0fdba7b70242 (diff)
Implement support for excluded and ad hoc prerequisites
The inclusion/exclusion is controlled via the 'include' prerequisite-specific variable. Valid values are: false - exclude true - include adhoc - include but treat as an ad hoc input For example: lib{foo}: cxx{win32-utility}: include = ($cxx.targe.class == 'windows') exe{bar}: libs{plugin}: include = adhoc
Diffstat (limited to 'build2/dist/rule.cxx')
-rw-r--r--build2/dist/rule.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx
index 5ae1f66..d5f42f0 100644
--- a/build2/dist/rule.cxx
+++ b/build2/dist/rule.cxx
@@ -31,6 +31,9 @@ namespace build2
for (prerequisite_member p:
group_prerequisite_members (a, t, members_mode::maybe))
{
+ // Note: no exclusion tests, we want all of them (and see also the
+ // dist_include() override).
+
// Skip prerequisites imported from other projects.
//
if (p.proj ())
@@ -49,6 +52,8 @@ namespace build2
// is mentioned as a target, then it is in out (we don't do the same
// target in both src/out).
//
+ // @@ Note that this is still an issue in a custom dist rule.
+ //
const target* pt (nullptr);
if (p.is_a<file> ())
{