diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2020-04-27 09:49:45 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-04-27 10:03:50 +0200 |
commit | 9e5750ae2e3f837f80860aaab6b01e4d556213ed (patch) | |
tree | d3b2e551e444c47b6ce0289969e78360161b6685 /build2/cli/rule.hxx | |
parent | 028e10ba787a7dbb46e3fcba6f88f496b76cebc5 (diff) |
Rework tool importation along with cli module
Specifically, now config.<tool> (like config.cli) is handled by the import
machinery (it is like a shorter alias for config.import.<tool>.<tool>.exe
that we already had). And the cli module now uses that instead of custom
logic.
This also adds support for uniform tool metadata extraction that is handled by
the import machinery. As a result, a tool that follows the "build2 way" can be
imported with metadata by the buildfile and/or corresponding module without
any tool-specific code or brittleness associated with parsing --version or
similar outputs. See the cli tool/module for details.
Finally, two new flavors of the import directive are now supported: import!
triggers immediate importation skipping any rule-specific logic while import?
is optional import (analogous to using?). Note that optional import is always
immediate. There is also the import-specific metadata attribute which can be
specified for these two import flavors in order to trigger metadata
importation. For example:
import? [metadata] cli = cli%exe{cli}
if ($cli != [null])
info "cli version $($cli:cli.version)"
Diffstat (limited to 'build2/cli/rule.hxx')
-rw-r--r-- | build2/cli/rule.hxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/build2/cli/rule.hxx b/build2/cli/rule.hxx index aa3b8fa..64f1614 100644 --- a/build2/cli/rule.hxx +++ b/build2/cli/rule.hxx @@ -13,12 +13,20 @@ namespace build2 { namespace cli { + // Cached data shared between rules and the module. + // + struct data + { + const exe& ctgt; // CLI compiler target. + const string& csum; // CLI compiler checksum. + }; + // @@ Redo as two separate rules? // - class compile_rule: public rule + class compile_rule: public rule, virtual data { public: - compile_rule () {} + compile_rule (data&& d): data (move (d)) {} virtual bool match (action, target&, const string&) const override; @@ -26,8 +34,8 @@ namespace build2 virtual recipe apply (action, target&) const override; - static target_state - perform_update (action, const target&); + target_state + perform_update (action, const target&) const; }; } } |