aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-10-16 11:12:52 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-10-16 11:12:52 +0200
commit87c1025a5a15fdd2f7d00165c3f77337de5e8e99 (patch)
tree80eca7f41b4de66f37bb92260cd5fa384f32ed63
parentb8a44445750a77e39ccd53d22a6c586b18861c55 (diff)
Release version 2.5.0-b.21HEADv2.5.0-b.21master
-rw-r--r--manifest4
-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, 10 insertions, 10 deletions
diff --git a/manifest b/manifest
index 92b6785..96d0e41 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-boost
-version: 2.5.0-b.20.z
+version: 2.5.0-b.21
project: odb
summary: Boost ODB profile library
license: GPL-2.0-only
@@ -18,4 +18,4 @@ requires: c++11
requires: libboost ; Requires not yet packaged libboost.
depends: * build2 >= 0.13.0
depends: * bpkg >= 0.13.0
-depends: libodb [2.5.0-b.20.1 2.5.0-b.21)
+depends: libodb == 2.5.0-b.21
diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in
index da797e2..644455f 100644
--- a/odb/boost/version-build2.hxx.in
+++ b/odb/boost/version-build2.hxx.in
@@ -5,7 +5,7 @@
// @@ TODO: need to derive automatically (it is also hardcoded in *.options).
//
-#define ODB_BOOST_VERSION 2047000
+#define ODB_BOOST_VERSION 2047100
// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 8a479fd..9de9649 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -31,23 +31,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20470
+#if ODB_VERSION != 20471
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2047000
-#define ODB_BOOST_VERSION_STR "2.5.0-b.20"
+#define ODB_BOOST_VERSION 2047100
+#define ODB_BOOST_VERSION_STR "2.5.0-b.21"
// 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 2049970
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.20"
+#define LIBODB_BOOST_VERSION 2049971
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.21"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index b12d624..8b0bf31 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -7,6 +7,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
---hxx-prologue '#if ODB_BOOST_VERSION != 2047000 // 2.5.0-b.20'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2047100 // 2.5.0-b.21'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index a60117f..412a335 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.20
+2.5.0-b.21