aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-11-21 06:30:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-11-21 06:30:31 +0200
commit665741180d6fc9d8af96a0c76638d4eb80dbd6b3 (patch)
tree679aa1e2f3b29892773d12f8d0c74609fcc9a053
parent0f4470b8d8c4083cb86d80bec9c41496601cf58e (diff)
Change version to 2.5.0-b.18.z
-rw-r--r--manifest8
-rw-r--r--odb/boost/version-build2.hxx.in2
-rw-r--r--odb/boost/version.hxx10
-rw-r--r--odb/boost/version.options2
-rw-r--r--version2
5 files changed, 12 insertions, 12 deletions
diff --git a/manifest b/manifest
index 81c91f4..838634b 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-boost
-version: 2.5.0-b.17
+version: 2.5.0-b.18.z
project: odb
summary: Boost ODB profile library
license: GPLv2
@@ -16,6 +16,6 @@ build-email: odb-builds@codesynthesis.com
builds: all
requires: c++11
requires: libboost ; Requires not yet packaged libboost.
-depends: * build2 >= 0.11.0
-depends: * bpkg >= 0.11.0
-depends: libodb == 2.5.0-b.17
+depends: * build2 >= 0.12.0
+depends: * bpkg >= 0.12.0
+depends: libodb [2.5.0-b.18.1 2.5.0-b.19)
diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in
index 25c5d73..723881b 100644
--- a/odb/boost/version-build2.hxx.in
+++ b/odb/boost/version-build2.hxx.in
@@ -6,7 +6,7 @@
// @@ TODO: need to derive automatically (it is also hardcoded in *.options).
//
-#define ODB_BOOST_VERSION 2046700
+#define ODB_BOOST_VERSION 2046800
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index f9cc3bc..9d0a25a 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -32,23 +32,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20467
+#if ODB_VERSION != 20468
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2046700
-#define ODB_BOOST_VERSION_STR "2.5.0-b.17"
+#define ODB_BOOST_VERSION 2046800
+#define ODB_BOOST_VERSION_STR "2.5.0-b.18"
// libodb-boost version: odb interface version plus the bugfix version. Note
// that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION
// since if the Boost interface virsion is incremented then the bugfix version
// must be incremented as well.
//
-#define LIBODB_BOOST_VERSION 2049967
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.17"
+#define LIBODB_BOOST_VERSION 2049968
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.18"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index b45c87a..6e8dff8 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -8,6 +8,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
---hxx-prologue '#if ODB_BOOST_VERSION != 2046700 // 2.5.0-b.17'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2046800 // 2.5.0-b.18'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 020c790..a9b5191 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.17
+2.5.0-b.18