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, 39 insertions, 69 deletions

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