aboutsummaryrefslogtreecommitdiff
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
parent126535431c9668ad1ef7c96b37b769aba6994934 (diff)
Bump version to 2.5.0.b.1.z, switch to build2 version module
-rw-r--r--build/bootstrap.build17
-rw-r--r--manifest6
-rw-r--r--odb/buildfile6
-rw-r--r--odb/version.hxx8
-rw-r--r--version2
5 files changed, 12 insertions, 27 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 796edca..9012dea 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -4,22 +4,7 @@
project = libodb
-using build@0.4.0
-
-version = 2.5.0-a11
-
-abi_major = 2
-abi_minor = 5
-abi_patch = 0
-abi_prerelease = true
-
-revision = 0
-
-dist.package = $project-$version
-
-if ($revision != 0)
- dist.package += +$revision
-
+using version
using config
using dist
using test
diff --git a/manifest b/manifest
index 534852d..0271781 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb
-version: 2.5.0-a11
+version: 2.5.0-b.1.z
summary: Common ODB runtime library
license: GPLv2
license: proprietary
@@ -11,5 +11,5 @@ url: http://www.codesynthesis.com/products/odb/
email: odb-users@codesynthesis.com
build-email: odb-builds@codesynthesis.com
requires: c++11
-depends: * build2 >= 0.4.0
-depends: * bpkg >= 0.4.0
+depends: * build2 >= 0.5.0-
+depends: * bpkg >= 0.5.0-
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>
diff --git a/version b/version
index b6012ca..07ad3e3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-a11
+2.5.0-b.1