aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/install
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-10-07 16:02:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-10-07 16:02:38 +0200
commitf745d8ba2b7d6fd6a725af5c58cd5f057fca8191 (patch)
tree7f702750799e463a6bef132df89dc432ebd3eb59 /libbuild2/install
parent7ee735c0a99b29979594920262db13b4939b3c2c (diff)
Allow forcing installation of exe{} prerequisites of file targets
This can be achieved with prerequisite-specific install=true, for example: exe{foo}: exe{bar}: install = true # foo runs bar
Diffstat (limited to 'libbuild2/install')
-rw-r--r--libbuild2/install/rule.cxx9
-rw-r--r--libbuild2/install/rule.hxx5
2 files changed, 12 insertions, 2 deletions
diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx
index b4b4a01..2d81067 100644
--- a/libbuild2/install/rule.cxx
+++ b/libbuild2/install/rule.cxx
@@ -289,7 +289,14 @@ namespace build2
action, const target& t, const prerequisite& p) const
{
if (p.is_a<exe> ())
- return nullptr;
+ {
+ // Feels like one day this should be unified with include (see
+ // context::var_include).
+ //
+ if (p.vars.empty () ||
+ cast_empty<path> (p.vars["install"]).string () != "true")
+ return nullptr;
+ }
const target& pt (search (t, p));
return is == nullptr || pt.in (*is) ? &pt : nullptr;
diff --git a/libbuild2/install/rule.hxx b/libbuild2/install/rule.hxx
index 61c0ae9..53d97d2 100644
--- a/libbuild2/install/rule.hxx
+++ b/libbuild2/install/rule.hxx
@@ -115,7 +115,10 @@ namespace build2
// ignores exe{} prerequisites assuming an exe{} listed for a file
// target is there to execute (e.g., to generate that target) and
// normally should not be installed (an exe{} would typically be
- // installed via the dir{./} alias).
+ // installed via the dir{./} alias). But this can be overridden with a
+ // prerequisite-specific install=true, for example:
+ //
+ // exe{foo}: exe{bar}: install = true # foo runs bar
//
// The prerequisite is passed as an iterator allowing the filter to
// "see" inside groups.