diff options
Diffstat (limited to 'build2/dist')
-rw-r--r-- | build2/dist/module.cxx | 11 | ||||
-rw-r--r-- | build2/dist/operation | 3 | ||||
-rw-r--r-- | build2/dist/operation.cxx | 2 | ||||
-rw-r--r-- | build2/dist/rule | 6 | ||||
-rw-r--r-- | build2/dist/rule.cxx | 2 |
5 files changed, 13 insertions, 11 deletions
diff --git a/build2/dist/module.cxx b/build2/dist/module.cxx index 6dd1453..c7c3a23 100644 --- a/build2/dist/module.cxx +++ b/build2/dist/module.cxx @@ -88,9 +88,7 @@ namespace build2 // must be explicitly specified or we will complain if and when // we try to dist. // - using namespace config; - - bool s (specified (r, "config.dist")); + bool s (config::specified (r, "config.dist")); // dist.root // @@ -99,7 +97,7 @@ namespace build2 if (s) { - const value& cv (optional_absolute (r, "config.dist.root")); + const value& cv (config::optional_absolute (r, "config.dist.root")); if (cv && !cv.empty ()) v = cv; @@ -113,7 +111,8 @@ namespace build2 if (s) { - const value& cv (required (r, "config.dist.cmd", "install").first); + const value& cv ( + config::required (r, "config.dist.cmd", "install").first); if (cv && !cv.empty ()) v = cv; @@ -129,7 +128,7 @@ namespace build2 if (s) { - const value& cv (optional (r, "config.dist.archives")); + const value& cv (config::optional (r, "config.dist.archives")); if (cv && !cv.empty ()) v = cv; diff --git a/build2/dist/operation b/build2/dist/operation index e00da8a..741b47e 100644 --- a/build2/dist/operation +++ b/build2/dist/operation @@ -5,6 +5,9 @@ #ifndef BUILD2_DIST_OPERATION #define BUILD2_DIST_OPERATION +#include <build2/types> +#include <build2/utility> + #include <build2/operation> namespace build2 diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx index f5b99fc..fba0ab5 100644 --- a/build2/dist/operation.cxx +++ b/build2/dist/operation.cxx @@ -4,8 +4,6 @@ #include <build2/dist/operation> -#include <cassert> - #include <butl/process> #include <butl/filesystem> diff --git a/build2/dist/rule b/build2/dist/rule index e460e66..f428ff2 100644 --- a/build2/dist/rule +++ b/build2/dist/rule @@ -5,8 +5,10 @@ #ifndef BUILD2_DIST_RULE #define BUILD2_DIST_RULE -#include <build2/rule> #include <build2/types> +#include <build2/utility> + +#include <build2/rule> #include <build2/target> #include <build2/operation> @@ -18,7 +20,7 @@ namespace build2 { public: virtual match_result - match (action, target&, const std::string&) const; + match (action, target&, const string&) const; virtual recipe apply (action, target&, const match_result&) const; diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx index f3d37eb..f3a99f9 100644 --- a/build2/dist/rule.cxx +++ b/build2/dist/rule.cxx @@ -16,7 +16,7 @@ namespace build2 namespace dist { match_result rule:: - match (action, target& t, const std::string&) const + match (action, target& t, const string&) const { return t; // We always match. } |