aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/bootstrap.build17
-rw-r--r--manifest8
-rw-r--r--odb/pgsql/buildfile6
-rw-r--r--odb/pgsql/version.hxx6
-rw-r--r--version2
5 files changed, 12 insertions, 27 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 2d110d2..f1aa64c 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -4,22 +4,7 @@
project = libodb-pgsql
-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 689fbd0..4e48b48 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-pgsql
-version: 2.5.0-a11
+version: 2.5.0-b.1.z
summary: PostgreSQL ODB runtime library
license: GPLv2
license: proprietary
@@ -11,7 +11,7 @@ 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-
depends: libpq >= 9.0.0
-depends: libodb == 2.5.0-a11
+depends: libodb [2.5.0.b.1.1 2.5.0.b.2)
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile
index b520621..3875ac9 100644
--- a/odb/pgsql/buildfile
+++ b/odb/pgsql/buildfile
@@ -52,10 +52,10 @@ details/build2/{h }{ config-vc } \
# 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-pgsql}: bin.lib.version = @-$version
+if $version.pre_release
+ lib{odb-pgsql}: bin.lib.version = @"-$version.project_id"
else
- lib{odb-pgsql}: bin.lib.version = @-$abi_major.$abi_minor
+ lib{odb-pgsql}: bin.lib.version = @"-$version.major.$version.minor"
cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2
obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
diff --git a/odb/pgsql/version.hxx b/odb/pgsql/version.hxx
index b7860ad..983abb9 100644
--- a/odb/pgsql/version.hxx
+++ b/odb/pgsql/version.hxx
@@ -29,15 +29,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20411
+#if ODB_VERSION != 20451
# error incompatible odb interface version detected
#endif
// libodb-pgsql version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_PGSQL_VERSION 2049911
-#define LIBODB_PGSQL_VERSION_STR "2.5.0-a11"
+#define LIBODB_PGSQL_VERSION 2049951
+#define LIBODB_PGSQL_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