diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 09:22:24 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-28 09:22:24 +0200 |
commit | cf9d75fdd1bb02c53f21ab84f64042ee0ec56a97 (patch) | |
tree | 0e5471b07357f2a130b976c948b62e3f6e164156 /build2/version | |
parent | c27b069ab3049e566738bc7a63e9b8fa57657553 (diff) |
Align build.version.* variables with standard version/version module
Diffstat (limited to 'build2/version')
-rw-r--r-- | build2/version/init.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/build2/version/init.cxx b/build2/version/init.cxx index 76c30da..3f8a42a 100644 --- a/build2/version/init.cxx +++ b/build2/version/init.cxx @@ -176,24 +176,15 @@ namespace build2 rs.assign (v) = move (val); }; - // Enough of project version for unique identification (can be used in - // places like soname, etc). - // - string id (v.string_version ()); - if (v.snapshot ()) // Trailing dot already in id. - { - id += (v.snapshot_sn == standard_version::latest_sn - ? "z" - : (v.snapshot_id.empty () - ? to_string (v.snapshot_sn): - v.snapshot_id)); - } - set ("version", v.string ()); // Package version. set ("version.project", v.string_project ()); set ("version.project_number", v.version); - set ("version.project_id", move (id)); + + // Enough of project version for unique identification (can be used in + // places like soname, etc). + // + set ("version.project_id", v.string_project_id ()); set ("version.epoch", uint64_t (v.epoch)); |