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 /libodb-mssql | |
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.
Diffstat (limited to 'libodb-mssql')
-rw-r--r-- | libodb-mssql/odb/mssql/buildfile | 16 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/version-build2-stub.hxx | 4 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/version-build2.hxx | 0 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/version.hxx | 48 | ||||
-rw-r--r-- | libodb-mssql/odb/mssql/version.hxx.in (renamed from libodb-mssql/odb/mssql/version-build2.hxx.in) | 26 |
5 files changed, 27 insertions, 67 deletions
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 |