diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-09-13 17:00:08 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-09-14 09:48:59 +0200 |
| commit | d552de5d028e1dfb108f343810604d0dfd74c2e6 (patch) | |
| tree | 3ed1a320b0c3788001a1c61ff468f3392630f789 /libbuild2/bash | |
| parent | b9ea935ac2e31144db8ebdc2a98ebfc3f94357cc (diff) | |
Consistently install prerequisites from any scope by default
It is also now possible to adjust this behavior with global
config.install.scope override. Valid values for this variable
are:
project -- only from project
strong -- from strong amalgamation
weak -- from weak amalgamation
global -- from all projects (default)
Diffstat (limited to 'libbuild2/bash')
| -rw-r--r-- | libbuild2/bash/rule.cxx | 15 | ||||
| -rw-r--r-- | libbuild2/bash/rule.hxx | 11 |
2 files changed, 2 insertions, 24 deletions
diff --git a/libbuild2/bash/rule.cxx b/libbuild2/bash/rule.cxx index d378227..82c06c7 100644 --- a/libbuild2/bash/rule.cxx +++ b/libbuild2/bash/rule.cxx @@ -420,20 +420,5 @@ namespace build2 return r; } - - const target* install_rule:: - filter (action a, const target& t, const prerequisite& p) const - { - // If this is a module prerequisite, install it as long as it is in the - // same amalgamation as we are. - // - if (p.is_a<bash> ()) - { - const target& pt (search (t, p)); - return pt.in (t.weak_scope ()) ? &pt : nullptr; - } - else - return file_rule::filter (a, t, p); - } } } diff --git a/libbuild2/bash/rule.hxx b/libbuild2/bash/rule.hxx index 81c4604..c54b07c 100644 --- a/libbuild2/bash/rule.hxx +++ b/libbuild2/bash/rule.hxx @@ -61,12 +61,8 @@ namespace build2 const string&) const; }; - // Installation rule for bash scripts (exe{}) and modules (bash{}). Here - // we do: - // - // 1. Signal to in_rule that this is update for install. - // - // 2. Custom filtering of prerequisites. + // Installation rule for bash scripts (exe{}) and modules (bash{}) that + // signals to in_rule that this is update for install. // class LIBBUILD2_BASH_SYMEXPORT install_rule: public install::file_rule { @@ -79,9 +75,6 @@ namespace build2 virtual recipe apply (action, target&) const override; - virtual const target* - filter (action, const target&, const prerequisite&) const override; - protected: const in_rule& in_; }; |