aboutsummaryrefslogtreecommitdiff
path: root/bbot/manifest
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-04-20 22:01:57 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-04-20 22:01:57 +0300
commit773fbb10eb59c4e855eccf9966a6ef3a68e3e0c3 (patch)
tree55178311afbf48536088fa4a83b3bf45d8ebcf0c /bbot/manifest
parent4b9c521172a2c30a84f76fcedcec37247878a24f (diff)
Get rid of variable struct
Diffstat (limited to 'bbot/manifest')
-rw-r--r--bbot/manifest17
1 files changed, 13 insertions, 4 deletions
diff --git a/bbot/manifest b/bbot/manifest
index 3022535..087fd25 100644
--- a/bbot/manifest
+++ b/bbot/manifest
@@ -17,8 +17,6 @@
#include <bbot/export>
-#include <bbot/variable>
-
namespace bbot
{
using strings = std::vector<std::string>;
@@ -105,8 +103,12 @@ namespace bbot
// Build system configuration variables (in addition to build environment
// configuration variables).
+ // Note: could be quoted.
//
- variables config;
+ strings config;
+
+ strings
+ unquoted_config ();
task_manifest (std::string nm,
bpkg::version vr,
@@ -114,7 +116,7 @@ namespace bbot
strings tr,
std::string mn,
butl::optional<butl::target_triplet> tg,
- variables cf)
+ strings cf)
: name (std::move (nm)),
version (std::move (vr)),
repository (std::move (rl)),
@@ -132,6 +134,13 @@ namespace bbot
void
serialize (butl::manifest_serializer&) const;
+
+ // Check that a string has the name=value format. The name must not
+ // contain spaces. Throw invalid_argument if the string doesn't conform to
+ // these rules.
+ //
+ static void
+ check_config (const std::string&);
};
class LIBBBOT_EXPORT task_response_manifest