diff options
Diffstat (limited to 'libbbot/build-config.hxx')
| -rw-r--r-- | libbbot/build-config.hxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libbbot/build-config.hxx b/libbbot/build-config.hxx index 363b889..de78739 100644 --- a/libbbot/build-config.hxx +++ b/libbbot/build-config.hxx @@ -10,7 +10,6 @@ #include <iosfwd> #include <libbutl/path.hxx> -#include <libbutl/optional.hxx> #include <libbutl/tab-parser.hxx> #include <libbutl/target-triplet.hxx> @@ -24,14 +23,12 @@ namespace bbot // struct build_config { - std::string machine_pattern; // Machine name pattern. - std::string name; // Configuration name. + std::string machine_pattern; // Machine name pattern. + std::string name; // Configuration name. + butl::target_triplet target; + std::vector<std::string> vars; // Note: quoting is preserved. - butl::optional<butl::target_triplet> target; - - std::vector<std::string> vars; - - // Warning-detecting regular expressions. + // Warning-detecting regular expressions. Note that quoting is preserved. // std::vector<std::string> warning_regexes; }; @@ -43,7 +40,7 @@ namespace bbot // // buildtab consists of lines in the following format: // - // <machine-pattern> <config> [<target>] [<config-vars>] [<warning-regex>] + // <machine-pattern> <config> <target> [<config-vars>] [<warning-regex>] // using butl::tab_parsing; |