From a46d6a870cc5815efed5b3f065ec69ff298936a8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 21 Jul 2020 15:13:40 +0200 Subject: Change version to 2.5.0-b.20.z --- manifest | 8 ++++---- odb/boost/version-build2.hxx.in | 2 +- odb/boost/version.hxx | 10 +++++----- odb/boost/version.options | 2 +- version | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 6f26ab7..17d297d 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-boost -version: 2.5.0-b.19 +version: 2.5.0-b.20.z project: odb summary: Boost ODB profile library license: GPL-2.0-only @@ -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.12.0 -depends: * bpkg >= 0.12.0 -depends: libodb == 2.5.0-b.19 +depends: * build2 >= 0.13.0 +depends: * bpkg >= 0.13.0 +depends: libodb [2.5.0-b.20.1 2.5.0-b.21) diff --git a/odb/boost/version-build2.hxx.in b/odb/boost/version-build2.hxx.in index cd92bc5..da797e2 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 2046900 +#define ODB_BOOST_VERSION 2047000 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx index c036102..8a479fd 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 != 20469 +#if ODB_VERSION != 20470 # error incompatible odb interface version detected #endif // ODB Boost interface version: odb interface version plus the Boost interface // version. // -#define ODB_BOOST_VERSION 2046900 -#define ODB_BOOST_VERSION_STR "2.5.0-b.19" +#define ODB_BOOST_VERSION 2047000 +#define ODB_BOOST_VERSION_STR "2.5.0-b.20" // 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 2049969 -#define LIBODB_BOOST_VERSION_STR "2.5.0-b.19" +#define LIBODB_BOOST_VERSION 2049970 +#define LIBODB_BOOST_VERSION_STR "2.5.0-b.20" #include diff --git a/odb/boost/version.options b/odb/boost/version.options index 474035e..b12d624 100644 --- a/odb/boost/version.options +++ b/odb/boost/version.options @@ -7,6 +7,6 @@ # --hxx-prologue '#include ' ---hxx-prologue '#if ODB_BOOST_VERSION != 2046900 // 2.5.0-b.19' +--hxx-prologue '#if ODB_BOOST_VERSION != 2047000 // 2.5.0-b.20' --hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions' --hxx-prologue '#endif' diff --git a/version b/version index ea83ada..a60117f 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.0-b.19 +2.5.0-b.20 -- cgit v1.1