aboutsummaryrefslogtreecommitdiff
path: root/odb
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-28 16:17:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-28 16:17:22 +0200
commit9c54bf28fd0f3f2e2f1592c3e8d071ff6decfe2c (patch)
tree82e684db8940890c32ad3b810289e40dfcc9089a /odb
parent126535431c9668ad1ef7c96b37b769aba6994934 (diff)
Bump version to 2.5.0.b.1.z, switch to build2 version module
Diffstat (limited to 'odb')
-rw-r--r--odb/buildfile6
-rw-r--r--odb/version.hxx8
2 files changed, 7 insertions, 7 deletions
diff --git a/odb/buildfile b/odb/buildfile
index 214b1ab..841fe43 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -95,10 +95,10 @@ details/shared-ptr/{hxx }{ exception } \
# For pre-releases use the complete version to make sure they cannot be used
# in place of another pre-release or the final version.
#
-if $abi_prerelease
- lib{odb}: bin.lib.version = @-$version
+if $version.pre_release
+ lib{odb}: bin.lib.version = @"-$version.project_id"
else
- lib{odb}: bin.lib.version = @-$abi_major.$abi_minor
+ lib{odb}: bin.lib.version = @"-$version.major.$version.minor"
cxx.poptions =+ "-I$src_root" -DLIBODB_BUILD2
obja{*}: cxx.poptions += -DLIBODB_STATIC_BUILD
diff --git a/odb/version.hxx b/odb/version.hxx
index d8e5fc2..954a15f 100644
--- a/odb/version.hxx
+++ b/odb/version.hxx
@@ -26,13 +26,13 @@
// ODB interface version: minor, major, and alpha/beta versions.
//
-#define ODB_VERSION 20411
-#define ODB_VERSION_STR "2.5-a11"
+#define ODB_VERSION 20451
+#define ODB_VERSION_STR "2.5-b.1"
// libodb version: interface version plus the bugfix version.
//
-#define LIBODB_VERSION 2049911
-#define LIBODB_VERSION_STR "2.5.0-a11"
+#define LIBODB_VERSION 2049951
+#define LIBODB_VERSION_STR "2.5.0-b.1"
#include <odb/post.hxx>