diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-29 07:38:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-29 10:43:54 +0200 |
| commit | 22dfcdb3f14eb69556a578ab1e2862d5ad0c0801 (patch) | |
| tree | 8a4a3a33420e4b4bf0d458f1afc61c2a3cbd26fe | |
| parent | 90415a0d95d0c23304d605715edc3744dba3fd92 (diff) | |
Rename version-build2.hxx.in to version.hxx.in in runtime libraries
Add old (manually-maintained) macros from version.hxx to version.hxx.in for
backwards-compatibility.
41 files changed, 266 insertions, 580 deletions
@@ -96,11 +96,10 @@ b install: ../odb-install/odb/ ``` Note that if building manually (that is, without `bdep`) and in-source, then -the checked out `libodb/odb/version-build2.hxx` and -`libodb-*/odb/*/version-build2.hxx` files will be overwritten during the build -but these changes should be ignored. To do this automatically, run: +the checked out `libodb/odb/version.hxx` and `libodb-*/odb/*/version.hxx` +files will be overwritten during the build but these changes should be +ignored. To do this automatically, run: ``` -git update-index --assume-unchanged \ - libodb/odb/version-build2.hxx libodb-*/odb/*/version-build2.hxx +git update-index --assume-unchanged libodb/odb/version.hxx libodb-*/odb/*/version.hxx ``` diff --git a/libodb-boost/odb/boost/buildfile b/libodb-boost/odb/boost/buildfile index 751b56e..ddd38ec 100644 --- a/libodb-boost/odb/boost/buildfile +++ b/libodb-boost/odb/boost/buildfile @@ -20,17 +20,17 @@ import int_libs = libodb%lib{odb} imp_libs = - lib{odb-boost}: {hxx ixx txx cxx}{** -version-build2} {hxx}{version-build2} \ - details/build2/{h}{*} \ - options{**} ../options{boost} \ - $imp_libs $int_libs + lib{odb-boost}: {hxx ixx txx cxx}{** -version} hxx{version} \ + details/build2/{h}{*} \ + options{**} ../options{boost} \ + $imp_libs $int_libs # Include the generated version header into the distribution (so that we # don't pick up an installed one) and don't remove it when cleaning in src # (so that clean results in a state identical to distributed). # - hxx{version-build2}: in{version-build2} $src_root/manifest - hxx{version-build2}: + hxx{version}: in{version} $src_root/manifest + hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -67,13 +67,6 @@ # install_include = [dir_path] include/odb/boost/ - # We want these to be picked up whether LIBODB_BOOST_BUILD2 is defined or - # not. - # - hxx{version}@./: install = false - hxx{version-build2}: install = $install_include/version.hxx - hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-boost/odb/boost/version-build2-stub.hxx b/libodb-boost/odb/boost/version-build2-stub.hxx deleted file mode 100644 index e29f23c..0000000 --- a/libodb-boost/odb/boost/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/boost/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/boost/version.hxx> diff --git a/libodb-boost/odb/boost/version-build2.hxx b/libodb-boost/odb/boost/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-boost/odb/boost/version-build2.hxx +++ /dev/null diff --git a/libodb-boost/odb/boost/version.hxx b/libodb-boost/odb/boost/version.hxx index c46e21a..e69de29 100644 --- a/libodb-boost/odb/boost/version.hxx +++ b/libodb-boost/odb/boost/version.hxx @@ -1,55 +0,0 @@ -// file : odb/boost/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_BOOST_BUILD2 -# include <odb/boost/version-build2.hxx> -#else - -#ifndef ODB_BOOST_VERSION_HXX -#define ODB_BOOST_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// ODB Boost interface version: odb interface version plus the Boost interface -// version. -// -#define ODB_BOOST_VERSION 2047600 -#define ODB_BOOST_VERSION_STR "2.5.0-b.26" - -// 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 2049976 -#define LIBODB_BOOST_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_BOOST_VERSION_HXX -#endif // LIBODB_BOOST_BUILD2 diff --git a/libodb-boost/odb/boost/version-build2.hxx.in b/libodb-boost/odb/boost/version.hxx.in index 37a1ffc..15aed4e 100644 --- a/libodb-boost/odb/boost/version-build2.hxx.in +++ b/libodb-boost/odb/boost/version.hxx.in @@ -1,13 +1,9 @@ -// file : odb/boost/version-build2.hxx.in +// file : odb/boost/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_BOOST_VERSION // Note: using the version macro itself. -// @@ TODO: need to derive automatically (it is also hardcoded in *.options). -// -#define ODB_BOOST_VERSION 2047600 - -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -26,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_BOOST_VERSION $libodb_boost.version.project_number$ULL +#define LIBODB_BOOST_VERSION_FULL $libodb_boost.version.project_number$ULL #define LIBODB_BOOST_VERSION_STR "$libodb_boost.version.project$" #define LIBODB_BOOST_VERSION_ID "$libodb_boost.version.project_id$" @@ -41,6 +37,38 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// + +// ODB Boost interface version: odb interface version plus the Boost interface +// version. +// +// NOTE: also hardcoded in *.options. +// +#define ODB_BOOST_VERSION 2047600 +#define ODB_BOOST_VERSION_STR "2.5.0-b.26" + +// 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 2049976 #endif // LIBODB_BOOST_VERSION diff --git a/libodb-mssql/odb/mssql/buildfile b/libodb-mssql/odb/mssql/buildfile index 5a99ebc..9d2b635 100644 --- a/libodb-mssql/odb/mssql/buildfile +++ b/libodb-mssql/odb/mssql/buildfile @@ -14,17 +14,17 @@ imp_libs = if ($cc.target.class != 'windows') import imp_libs = libunixodbc%lib{odbc} -lib{odb-mssql}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-mssql}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ + details/build2/{h}{*} \ $imp_libs $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -142,12 +142,6 @@ install_include = [dir_path] include/odb/mssql/ install.subdirs = true } -# We want these to be picked up whether LIBODB_MSSQL_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-mssql/odb/mssql/version-build2-stub.hxx b/libodb-mssql/odb/mssql/version-build2-stub.hxx deleted file mode 100644 index 969ab3c..0000000 --- a/libodb-mssql/odb/mssql/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/mssql/version-build2-stub.hxx -// license : ODB NCUEL; see accompanying LICENSE file - -#include <odb/mssql/version.hxx> diff --git a/libodb-mssql/odb/mssql/version-build2.hxx b/libodb-mssql/odb/mssql/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-mssql/odb/mssql/version-build2.hxx +++ /dev/null diff --git a/libodb-mssql/odb/mssql/version.hxx b/libodb-mssql/odb/mssql/version.hxx index 5b6cc56..e69de29 100644 --- a/libodb-mssql/odb/mssql/version.hxx +++ b/libodb-mssql/odb/mssql/version.hxx @@ -1,48 +0,0 @@ -// file : odb/mssql/version.hxx -// license : ODB NCUEL; see accompanying LICENSE file - -#ifdef LIBODB_MSSQL_BUILD2 -# include <odb/mssql/version-build2.hxx> -#else - -#ifndef ODB_MSSQL_VERSION_HXX -#define ODB_MSSQL_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/mssql/details/config.hxx> -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// libodb-mssql version: odb interface version plus the bugfix -// version. -// -#define LIBODB_MSSQL_VERSION 2049976 -#define LIBODB_MSSQL_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_MSSQL_VERSION_HXX -#endif // LIBODB_MSSQL_BUILD2 diff --git a/libodb-mssql/odb/mssql/version-build2.hxx.in b/libodb-mssql/odb/mssql/version.hxx.in index 9f57dfe..02a404f 100644 --- a/libodb-mssql/odb/mssql/version-build2.hxx.in +++ b/libodb-mssql/odb/mssql/version.hxx.in @@ -1,9 +1,9 @@ -// file : odb/mssql/version-build2.hxx.in +// file : odb/mssql/version.hxx.in // license : ODB NCUEL; see accompanying LICENSE file #ifndef LIBODB_MSSQL_VERSION // Note: using the version macro itself. -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -22,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_MSSQL_VERSION $libodb_mssql.version.project_number$ULL +#define LIBODB_MSSQL_VERSION_FULL $libodb_mssql.version.project_number$ULL #define LIBODB_MSSQL_VERSION_STR "$libodb_mssql.version.project$" #define LIBODB_MSSQL_VERSION_ID "$libodb_mssql.version.project_id$" @@ -37,6 +37,24 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// +#define LIBODB_MSSQL_VERSION 2049976 #endif // LIBODB_MSSQL_VERSION diff --git a/libodb-mysql/odb/mysql/buildfile b/libodb-mysql/odb/mysql/buildfile index 8fc2358..708d093 100644 --- a/libodb-mysql/odb/mysql/buildfile +++ b/libodb-mysql/odb/mysql/buildfile @@ -10,17 +10,17 @@ import int_libs += ($client_lib == 'mysql' \ ? libmysqlclient%lib{mysqlclient} \ : libmariadb%lib{mariadb}) -lib{odb-mysql}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-mysql}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ + details/build2/{h}{*} \ $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -142,12 +142,6 @@ install_include = [dir_path] include/odb/mysql/ install.subdirs = true } -# We want these to be picked up whether LIBODB_MYSQL_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-mysql/odb/mysql/version-build2-stub.hxx b/libodb-mysql/odb/mysql/version-build2-stub.hxx deleted file mode 100644 index 72bb807..0000000 --- a/libodb-mysql/odb/mysql/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/mysql/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/mysql/version.hxx> diff --git a/libodb-mysql/odb/mysql/version-build2.hxx b/libodb-mysql/odb/mysql/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-mysql/odb/mysql/version-build2.hxx +++ /dev/null diff --git a/libodb-mysql/odb/mysql/version.hxx b/libodb-mysql/odb/mysql/version.hxx index d778a10..e69de29 100644 --- a/libodb-mysql/odb/mysql/version.hxx +++ b/libodb-mysql/odb/mysql/version.hxx @@ -1,61 +0,0 @@ -// file : odb/mysql/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_MYSQL_BUILD2 -# include <odb/mysql/version-build2.hxx> -#else - -#ifndef ODB_MYSQL_VERSION_HXX -#define ODB_MYSQL_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/mysql/details/config.hxx> - -#ifdef LIBODB_MYSQL_INCLUDE_SHORT -# include <mysql_version.h> -#else -# include <mysql/mysql_version.h> -#endif - -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// Check that we have a compatible MySQL version (5.0.3 or later). -// -#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID < 50003 -# error incompatible MySQL version detected -#endif - -// libodb-mysql version: odb interface version plus the bugfix -// version. -// -#define LIBODB_MYSQL_VERSION 2049976 -#define LIBODB_MYSQL_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_MYSQL_VERSION_HXX -#endif // LIBODB_MYSQL_BUILD2 diff --git a/libodb-mysql/odb/mysql/version-build2.hxx.in b/libodb-mysql/odb/mysql/version.hxx.in index 3db7601..0526554 100644 --- a/libodb-mysql/odb/mysql/version-build2.hxx.in +++ b/libodb-mysql/odb/mysql/version.hxx.in @@ -1,9 +1,9 @@ -// file : odb/mysql/version-build2.hxx.in +// file : odb/mysql/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_MYSQL_VERSION // Note: using the version macro itself. -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -22,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_MYSQL_VERSION $libodb_mysql.version.project_number$ULL +#define LIBODB_MYSQL_VERSION_FULL $libodb_mysql.version.project_number$ULL #define LIBODB_MYSQL_VERSION_STR "$libodb_mysql.version.project$" #define LIBODB_MYSQL_VERSION_ID "$libodb_mysql.version.project_id$" @@ -57,6 +57,25 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// +#define LIBODB_MYSQL_VERSION 2049976 #endif // LIBODB_MYSQL_VERSION diff --git a/libodb-oracle/odb/oracle/buildfile b/libodb-oracle/odb/oracle/buildfile index c1cb778..1f377a1 100644 --- a/libodb-oracle/odb/oracle/buildfile +++ b/libodb-oracle/odb/oracle/buildfile @@ -13,17 +13,17 @@ if ($cc.target.class != 'windows') else import imp_libs = liboci%lib{oci} -lib{odb-oracle}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-oracle}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ + details/build2/{h}{*} \ $imp_libs $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -138,12 +138,6 @@ install_include = [dir_path] include/odb/oracle/ install.subdirs = true } -# We want these to be picked up whether LIBODB_ORACLE_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-oracle/odb/oracle/version-build2-stub.hxx b/libodb-oracle/odb/oracle/version-build2-stub.hxx deleted file mode 100644 index d7da05c..0000000 --- a/libodb-oracle/odb/oracle/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/oracle/version-build2-stub.hxx -// license : ODB NCUEL; see accompanying LICENSE file - -#include <odb/oracle/version.hxx> diff --git a/libodb-oracle/odb/oracle/version-build2.hxx b/libodb-oracle/odb/oracle/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-oracle/odb/oracle/version-build2.hxx +++ /dev/null diff --git a/libodb-oracle/odb/oracle/version.hxx b/libodb-oracle/odb/oracle/version.hxx index 1523172..e69de29 100644 --- a/libodb-oracle/odb/oracle/version.hxx +++ b/libodb-oracle/odb/oracle/version.hxx @@ -1,48 +0,0 @@ -// file : odb/oracle/version.hxx -// license : ODB NCUEL; see accompanying LICENSE file - -#ifdef LIBODB_ORACLE_BUILD2 -# include <odb/oracle/version-build2.hxx> -#else - -#ifndef ODB_ORACLE_VERSION_HXX -#define ODB_ORACLE_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/oracle/details/config.hxx> -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// libodb-oracle version: odb interface version plus the bugfix -// version. -// -#define LIBODB_ORACLE_VERSION 2049976 -#define LIBODB_ORACLE_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_ORACLE_VERSION_HXX -#endif // LIBODB_ORACLE_BUILD2 diff --git a/libodb-oracle/odb/oracle/version-build2.hxx.in b/libodb-oracle/odb/oracle/version.hxx.in index 6006a0e..c13ce47 100644 --- a/libodb-oracle/odb/oracle/version-build2.hxx.in +++ b/libodb-oracle/odb/oracle/version.hxx.in @@ -1,9 +1,9 @@ -// file : odb/oracle/version-build2.hxx.in +// file : odb/oracle/version.hxx.in // license : ODB NCUEL; see accompanying LICENSE file #ifndef LIBODB_ORACLE_VERSION // Note: using the version macro itself. -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -22,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_ORACLE_VERSION $libodb_oracle.version.project_number$ULL +#define LIBODB_ORACLE_VERSION_FULL $libodb_oracle.version.project_number$ULL #define LIBODB_ORACLE_VERSION_STR "$libodb_oracle.version.project$" #define LIBODB_ORACLE_VERSION_ID "$libodb_oracle.version.project_id$" @@ -37,6 +37,25 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// +#define LIBODB_ORACLE_VERSION 2049976 #endif // LIBODB_ORACLE_VERSION diff --git a/libodb-pgsql/odb/pgsql/buildfile b/libodb-pgsql/odb/pgsql/buildfile index f1d05b6..2d264d8 100644 --- a/libodb-pgsql/odb/pgsql/buildfile +++ b/libodb-pgsql/odb/pgsql/buildfile @@ -7,17 +7,17 @@ cli{*}: extension = cli import int_libs = libodb%lib{odb} import imp_libs = libpq%lib{pq} -lib{odb-pgsql}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-pgsql}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ + details/build2/{h}{*} \ $imp_libs $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -132,12 +132,6 @@ install_include = [dir_path] include/odb/pgsql/ install.subdirs = true } -# We want these to be picked up whether LIBODB_PGSQL_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-pgsql/odb/pgsql/version-build2-stub.hxx b/libodb-pgsql/odb/pgsql/version-build2-stub.hxx deleted file mode 100644 index a99b093..0000000 --- a/libodb-pgsql/odb/pgsql/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/pgsql/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/pgsql/version.hxx> diff --git a/libodb-pgsql/odb/pgsql/version-build2.hxx b/libodb-pgsql/odb/pgsql/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-pgsql/odb/pgsql/version-build2.hxx +++ /dev/null diff --git a/libodb-pgsql/odb/pgsql/version.hxx b/libodb-pgsql/odb/pgsql/version.hxx index e050de4..e69de29 100644 --- a/libodb-pgsql/odb/pgsql/version.hxx +++ b/libodb-pgsql/odb/pgsql/version.hxx @@ -1,48 +0,0 @@ -// file : odb/pgsql/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_PGSQL_BUILD2 -# include <odb/pgsql/version-build2.hxx> -#else - -#ifndef ODB_PGSQL_VERSION_HXX -#define ODB_PGSQL_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/pgsql/details/config.hxx> -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// libodb-pgsql version: odb interface version plus the bugfix -// version. -// -#define LIBODB_PGSQL_VERSION 2049976 -#define LIBODB_PGSQL_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_PGSQL_VERSION_HXX -#endif // LIBODB_PGSQL_BUILD2 diff --git a/libodb-pgsql/odb/pgsql/version-build2.hxx.in b/libodb-pgsql/odb/pgsql/version.hxx.in index ed4396b..db8b152 100644 --- a/libodb-pgsql/odb/pgsql/version-build2.hxx.in +++ b/libodb-pgsql/odb/pgsql/version.hxx.in @@ -1,9 +1,9 @@ -// file : odb/pgsql/version-build2.hxx.in +// file : odb/pgsql/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_PGSQL_VERSION // Note: using the version macro itself. -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -22,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_PGSQL_VERSION $libodb_pgsql.version.project_number$ULL +#define LIBODB_PGSQL_VERSION_FULL $libodb_pgsql.version.project_number$ULL #define LIBODB_PGSQL_VERSION_STR "$libodb_pgsql.version.project$" #define LIBODB_PGSQL_VERSION_ID "$libodb_pgsql.version.project_id$" @@ -37,6 +37,25 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// +#define LIBODB_PGSQL_VERSION 2049976 #endif // LIBODB_PGSQL_VERSION diff --git a/libodb-qt/odb/qt/buildfile b/libodb-qt/odb/qt/buildfile index 63e6c95..98afecd 100644 --- a/libodb-qt/odb/qt/buildfile +++ b/libodb-qt/odb/qt/buildfile @@ -20,17 +20,17 @@ import int_libs = libodb%lib{odb} imp_libs = - lib{odb-qt}: {hxx ixx txx cxx}{** -version-build2} {hxx}{version-build2} \ - details/build2/{h}{*} \ - options{**} ../options{qt} \ - $imp_libs $int_libs + lib{odb-qt}: {hxx ixx txx cxx}{** -version} {hxx}{version} \ + details/build2/{h}{*} \ + options{**} ../options{qt} \ + $imp_libs $int_libs # Include the generated version header into the distribution (so that we # don't pick up an installed one) and don't remove it when cleaning in src # (so that clean results in a state identical to distributed). # - hxx{version-build2}: in{version-build2} $src_root/manifest - hxx{version-build2}: + hxx{version}: in{version} $src_root/manifest + hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -67,13 +67,6 @@ # install_include = [dir_path] include/odb/qt/ - # We want these to be picked up whether LIBODB_QT_BUILD2 is defined or - # not. - # - hxx{version}@./: install = false - hxx{version-build2}: install = $install_include/version.hxx - hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-qt/odb/qt/version-build2-stub.hxx b/libodb-qt/odb/qt/version-build2-stub.hxx deleted file mode 100644 index b00d1de..0000000 --- a/libodb-qt/odb/qt/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/qt/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/qt/version.hxx> diff --git a/libodb-qt/odb/qt/version-build2.hxx b/libodb-qt/odb/qt/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-qt/odb/qt/version-build2.hxx +++ /dev/null diff --git a/libodb-qt/odb/qt/version.hxx b/libodb-qt/odb/qt/version.hxx index 4f9510a..e69de29 100644 --- a/libodb-qt/odb/qt/version.hxx +++ b/libodb-qt/odb/qt/version.hxx @@ -1,55 +0,0 @@ -// file : odb/qt/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_QT_BUILD2 -# include <odb/qt/version-build2.hxx> -#else - -#ifndef ODB_QT_VERSION_HXX -#define ODB_QT_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// ODB Qt interface version: odb interface version plus the Qt interface -// version. -// -#define ODB_QT_VERSION 2047600 -#define ODB_QT_VERSION_STR "2.5.0-b.26" - -// libodb-qt version: odb interface version plus the bugfix version. Note -// that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION -// since if the Qt interface virsion is incremented then the bugfix version -// must be incremented as well. -// -#define LIBODB_QT_VERSION 2049976 -#define LIBODB_QT_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_QT_VERSION_HXX -#endif // LIBODB_QT_BUILD2 diff --git a/libodb-qt/odb/qt/version-build2.hxx.in b/libodb-qt/odb/qt/version.hxx.in index 51f1191..c7ce430 100644 --- a/libodb-qt/odb/qt/version-build2.hxx.in +++ b/libodb-qt/odb/qt/version.hxx.in @@ -1,13 +1,9 @@ -// file : odb/qt/version-build2.hxx.in +// file : odb/qt/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_QT_VERSION // Note: using the version macro itself. -// @@ TODO: need to derive automatically (it is also hardcoded in *.options). -// -#define ODB_QT_VERSION 2047600 - -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -26,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_QT_VERSION $libodb_qt.version.project_number$ULL +#define LIBODB_QT_VERSION_FULL $libodb_qt.version.project_number$ULL #define LIBODB_QT_VERSION_STR "$libodb_qt.version.project$" #define LIBODB_QT_VERSION_ID "$libodb_qt.version.project_id$" @@ -43,4 +39,37 @@ $libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// + +// ODB Qt interface version: odb interface version plus the Qt interface +// version. +// +// NOTE: also hardcoded in *.options. +// +#define ODB_QT_VERSION 2047600 +#define ODB_QT_VERSION_STR "2.5.0-b.26" + +// libodb-qt version: odb interface version plus the bugfix version. Note +// that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION +// since if the Qt interface virsion is incremented then the bugfix version +// must be incremented as well. +// +#define LIBODB_QT_VERSION 2049976 + #endif // LIBODB_QT_VERSION diff --git a/libodb-sqlite/odb/sqlite/buildfile b/libodb-sqlite/odb/sqlite/buildfile index d2a6656..22bca96 100644 --- a/libodb-sqlite/odb/sqlite/buildfile +++ b/libodb-sqlite/odb/sqlite/buildfile @@ -7,17 +7,17 @@ cli{*}: extension = cli import int_libs = libodb%lib{odb} import int_libs += libsqlite3%lib{sqlite3} -lib{odb-sqlite}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ - details/{hxx ixx txx cxx}{* -options} \ - details/build2/{h}{*} \ +lib{odb-sqlite}: {hxx ixx txx cxx}{* -version} {hxx}{version} \ + details/{hxx ixx txx cxx}{* -options} \ + details/build2/{h}{*} \ $int_libs # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -132,12 +132,6 @@ install_include = [dir_path] include/odb/sqlite/ install.subdirs = true } -# We want these to be picked up whether LIBODB_SQLITE_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb-sqlite/odb/sqlite/version-build2-stub.hxx b/libodb-sqlite/odb/sqlite/version-build2-stub.hxx deleted file mode 100644 index a6bb4d0..0000000 --- a/libodb-sqlite/odb/sqlite/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/sqlite/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/sqlite/version.hxx> diff --git a/libodb-sqlite/odb/sqlite/version-build2.hxx b/libodb-sqlite/odb/sqlite/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb-sqlite/odb/sqlite/version-build2.hxx +++ /dev/null diff --git a/libodb-sqlite/odb/sqlite/version.hxx b/libodb-sqlite/odb/sqlite/version.hxx index ad468de..e69de29 100644 --- a/libodb-sqlite/odb/sqlite/version.hxx +++ b/libodb-sqlite/odb/sqlite/version.hxx @@ -1,47 +0,0 @@ -// file : odb/sqlite/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_SQLITE_BUILD2 -# include <odb/sqlite/version-build2.hxx> -#else - -#ifndef ODB_SQLITE_VERSION_HXX -#define ODB_SQLITE_VERSION_HXX - -#include <odb/pre.hxx> - -#include <odb/version.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// Check that we have compatible ODB version. -// -#if ODB_VERSION != 20476 -# error incompatible odb interface version detected -#endif - -// libodb-sqlite version: odb interface version plus the bugfix -// version. -// -#define LIBODB_SQLITE_VERSION 2049976 -#define LIBODB_SQLITE_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_SQLITE_VERSION_HXX -#endif // LIBODB_SQLITE_BUILD2 diff --git a/libodb-sqlite/odb/sqlite/version-build2.hxx.in b/libodb-sqlite/odb/sqlite/version.hxx.in index 50fef2d..c100d57 100644 --- a/libodb-sqlite/odb/sqlite/version-build2.hxx.in +++ b/libodb-sqlite/odb/sqlite/version.hxx.in @@ -1,9 +1,9 @@ -// file : odb/sqlite/version-build2.hxx.in +// file : odb/sqlite/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_SQLITE_VERSION // Note: using the version macro itself. -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -22,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_SQLITE_VERSION $libodb_sqlite.version.project_number$ULL +#define LIBODB_SQLITE_VERSION_FULL $libodb_sqlite.version.project_number$ULL #define LIBODB_SQLITE_VERSION_STR "$libodb_sqlite.version.project$" #define LIBODB_SQLITE_VERSION_ID "$libodb_sqlite.version.project_id$" @@ -37,6 +37,25 @@ #include <odb/version.hxx> -$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$ +$libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ + + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// +#define LIBODB_SQLITE_VERSION 2049976 #endif // LIBODB_SQLITE_VERSION diff --git a/libodb/odb/buildfile b/libodb/odb/buildfile index ec95e94..2df1874 100644 --- a/libodb/odb/buildfile +++ b/libodb/odb/buildfile @@ -1,21 +1,21 @@ # file : odb/buildfile # license : GNU GPL v2; see accompanying LICENSE file -lib{odb}: {hxx ixx txx cxx}{* -version-build2} \ - {hxx}{version-build2} \ - details/{hxx ixx txx}{*} \ - details/{cxx}{* -condition -lock -mutex} \ - details/build2/{h}{*} \ - details/meta/{hxx}{*} \ -details/shared-ptr/{hxx ixx txx cxx}{*} \ +lib{odb}: {hxx ixx txx cxx}{* -version} \ + {hxx}{version} \ + details/{hxx ixx txx}{*} \ + details/{cxx}{* -condition -lock -mutex} \ + details/build2/{h}{*} \ + details/meta/{hxx}{*} \ +details/shared-ptr/{hxx ixx txx cxx}{*} \ details/win32/{hxx}{windows} # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). # -hxx{version-build2}: in{version-build2} $src_root/manifest -hxx{version-build2}: +hxx{version}: in{version} $src_root/manifest +hxx{version}: { dist = true clean = ($src_root != $out_root) @@ -58,12 +58,6 @@ install_include = [dir_path] include/odb/ if ($cxx.target.class != "windows") details/win32/*: install = false -# We want these to be picked up whether LIBODB_BUILD2 is defined or not. -# -hxx{version}@./: install = false -hxx{version-build2}: install = $install_include/version.hxx -hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx - details/build2/ { h{*}: install = false diff --git a/libodb/odb/version-build2-stub.hxx b/libodb/odb/version-build2-stub.hxx deleted file mode 100644 index f4c7937..0000000 --- a/libodb/odb/version-build2-stub.hxx +++ /dev/null @@ -1,4 +0,0 @@ -// file : odb/version-build2-stub.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#include <odb/version.hxx> diff --git a/libodb/odb/version-build2.hxx b/libodb/odb/version-build2.hxx deleted file mode 100644 index e69de29..0000000 --- a/libodb/odb/version-build2.hxx +++ /dev/null diff --git a/libodb/odb/version.hxx b/libodb/odb/version.hxx index 4961e1a..e69de29 100644 --- a/libodb/odb/version.hxx +++ b/libodb/odb/version.hxx @@ -1,43 +0,0 @@ -// file : odb/version.hxx -// license : GNU GPL v2; see accompanying LICENSE file - -#ifdef LIBODB_BUILD2 -# include <odb/version-build2.hxx> -#else - -#ifndef ODB_VERSION_HXX -#define ODB_VERSION_HXX - -#include <odb/pre.hxx> - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -// ODB interface version: minor, major, and alpha/beta versions. -// -#define ODB_VERSION 20476 -#define ODB_VERSION_STR "2.5-b.26" - -// libodb version: interface version plus the bugfix version. -// -#define LIBODB_VERSION 2049976 -#define LIBODB_VERSION_STR "2.5.0-b.26" - -#include <odb/post.hxx> - -#endif // ODB_VERSION_HXX -#endif // LIBODB_BUILD2 diff --git a/libodb/odb/version-build2.hxx.in b/libodb/odb/version.hxx.in index 3672585..178c8cc 100644 --- a/libodb/odb/version-build2.hxx.in +++ b/libodb/odb/version.hxx.in @@ -1,13 +1,9 @@ -// file : odb/version-build2.hxx.in +// file : odb/version.hxx.in // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_VERSION // Note: using the version macro itself. -// For the ODB compiler (temporary). -// -#define ODB_VERSION 20476 - -// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// New numeric version format is AAAAABBBBBCCCCCDDDE where: // // AAAAA - major version number // BBBBB - minor version number @@ -26,7 +22,7 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_VERSION $libodb.version.project_number$ULL +#define LIBODB_VERSION_FULL $libodb.version.project_number$ULL #define LIBODB_VERSION_STR "$libodb.version.project$" #define LIBODB_VERSION_ID "$libodb.version.project_id$" @@ -39,4 +35,31 @@ #define LIBODB_SNAPSHOT $libodb.version.snapshot_sn$ULL #define LIBODB_SNAPSHOT_ID "$libodb.version.snapshot_id$" + +// Old/deprecated numeric version format is AABBCCDD where: +// +// AA - major version number +// BB - minor version number +// CC - bugfix version number +// DD - alpha / beta (DD + 50) version number +// +// When DD is not 00, 1 is subtracted from AABBCC. For example: +// +// Version AABBCCDD +// 2.0.0 02000000 +// 2.1.0 02010000 +// 2.1.1 02010100 +// 2.2.0.a1 02019901 +// 3.0.0.b2 02999952 +// + +// ODB interface version: minor, major, and alpha/beta versions. +// +#define ODB_VERSION 20476 +#define ODB_VERSION_STR "2.5-b.26" + +// libodb version: interface version plus the bugfix version. +// +#define LIBODB_VERSION 2049976 + #endif // LIBODB_VERSION |