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, 42 insertions, 79 deletions

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