aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-05-23 17:54:45 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-05-23 17:54:45 +0300
commitebc0d5300be28477e00f0a8436cda72573250a8b (patch)
tree749a0067b2b2ac907d999f44fc557fd1b39aaea8
parentcfa962f6efc5429e079bda173a9fff86e377da46 (diff)
Adapt to increasing standard version major, minor, and patch max values up to 99999
-rw-r--r--bdep/new.cxx28
-rw-r--r--bdep/release.cxx18
2 files changed, 23 insertions, 23 deletions
diff --git a/bdep/new.cxx b/bdep/new.cxx
index 4a37fdb..6646b9f 100644
--- a/bdep/new.cxx
+++ b/bdep/new.cxx
@@ -1206,24 +1206,24 @@ namespace bdep
os << "#pragma once" << endl
<< endl
- << "// The numeric version format is AAABBBCCCDDDE where:"<< endl
+ << "// The numeric version format is AAAAABBBBBCCCCCDDDE where:"<< endl
<< "//" << endl
- << "// AAA - major version number" << endl
- << "// BBB - minor version number" << endl
- << "// CCC - bugfix version number" << endl
- << "// DDD - alpha / beta (DDD + 500) version number" << endl
- << "// E - final (0) / snapshot (1)" << endl
+ << "// AAAAA - major version number" << endl
+ << "// BBBBB - minor version number" << endl
+ << "// CCCCC - bugfix version number" << endl
+ << "// DDD - alpha / beta (DDD + 500) version number" << endl
+ << "// E - final (0) / snapshot (1)" << endl
<< "//" << endl
- << "// When DDDE is not 0, 1 is subtracted from AAABBBCCC. For example:" << endl
+ << "// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example:" << endl
<< "//" << endl
- << "// Version AAABBBCCCDDDE" << endl
+ << "// Version AAAAABBBBBCCCCCDDDE" << endl
<< "//" << endl
- << "// 0.1.0 0000010000000" << endl
- << "// 0.1.2 0000010010000" << endl
- << "// 1.2.3 0010020030000" << endl
- << "// 2.2.0-a.1 0020019990010" << endl
- << "// 3.0.0-b.2 0029999995020" << endl
- << "// 2.2.0-a.1.z 0020019990011" << endl
+ << "// 0.1.0 0000000001000000000" << endl
+ << "// 0.1.2 0000000001000020000" << endl
+ << "// 1.2.3 0000100002000030000" << endl
+ << "// 2.2.0-a.1 0000200001999990010" << endl
+ << "// 3.0.0-b.2 0000299999999995020" << endl
+ << "// 2.2.0-a.1.z 0000200001999990011" << endl
<< "//" << endl
<< "#define " << mp << "_VERSION $" << v << ".version.project_number$ULL" << endl
<< "#define " << mp << "_VERSION_STR \"$" << v << ".version.project$\"" << endl
diff --git a/bdep/release.cxx b/bdep/release.cxx
index de91dbb..d82e978 100644
--- a/bdep/release.cxx
+++ b/bdep/release.cxx
@@ -160,9 +160,9 @@ namespace bdep
//
auto& ov (prj.open_version);
- auto make_snapshot = [&cv] (uint16_t major,
- uint16_t minor,
- uint16_t patch,
+ auto make_snapshot = [&cv] (uint32_t major,
+ uint32_t minor,
+ uint32_t patch,
uint16_t pre_release = 0 /* a.0 */)
{
return standard_version (cv.epoch,
@@ -243,9 +243,9 @@ namespace bdep
if (const char* n = (o.open_beta () ? "--open-beta" : nullptr))
fail << n << " specified for final current version " << cv;
- uint16_t mj (cv.major ());
- uint16_t mi (cv.minor ());
- uint16_t pa (cv.patch ());
+ uint32_t mj (cv.major ());
+ uint32_t mi (cv.minor ());
+ uint32_t pa (cv.patch ());
if (o.open_major ()) {mj++; mi = pa = 0;}
else if (o.open_minor ()) { mi++; pa = 0;}
@@ -300,9 +300,9 @@ namespace bdep
//
// Note that there is no --patch since we cannot jump to patch.
//
- uint16_t mj (cv.major ());
- uint16_t mi (cv.minor ());
- uint16_t pa (cv.patch ());
+ uint32_t mj (cv.major ());
+ uint32_t mi (cv.minor ());
+ uint32_t pa (cv.patch ());
uint16_t pr (*cv.pre_release ());
if (o.major ()) {mj++; mi = pa = pr = 0;}