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.

5 files changed, 28 insertions, 80 deletions

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