aboutsummaryrefslogtreecommitdiff
path: root/build2/utility.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-01-15 16:32:13 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-01-15 21:14:31 +0200
commitc7c3fd96e97ae2ec3914d36cb920a6f02c9a3414 (patch)
tree99995a41e386174a22ba83009a4bd49038e681fd /build2/utility.cxx
parent9dff5c62fe2b0814ab7fc943c3f527434d637b2f (diff)
Support X.Y.Z- version notation
Diffstat (limited to 'build2/utility.cxx')
-rw-r--r--build2/utility.cxx19
1 files changed, 12 insertions, 7 deletions
diff --git a/build2/utility.cxx b/build2/utility.cxx
index bd74e6d..3f078a7 100644
--- a/build2/utility.cxx
+++ b/build2/utility.cxx
@@ -61,16 +61,21 @@ namespace build2
char k (s[++p]);
- if (k != 'a' && k != 'b')
- bail ("'a' or 'b' expected in release component");
+ if (k != '\0')
+ {
+ if (k != 'a' && k != 'b')
+ bail ("'a' or 'b' expected in release component");
- ab = parse (++p, "invalid release component", 1, 49);
+ ab = parse (++p, "invalid release component", 1, 49);
- if (p != n)
- bail ("junk after release component");
+ if (p != n)
+ bail ("junk after release component");
- if (k == 'b')
- ab += 50;
+ if (k == 'b')
+ ab += 50;
+ }
+ else
+ ab = 1;
}
// AABBCCDD