diff options
Diffstat (limited to 'libodb-qt/odb/qt')
-rw-r--r-- | libodb-qt/odb/qt/buildfile | 42 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/build2/config-stub.h | 5 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/build2/config-vc-stub.h | 5 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/build2/config-vc.h | 15 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/build2/config.h | 17 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/config-vc.h | 5 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/config.h.in | 12 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/config.hxx | 8 | ||||
-rw-r--r-- | libodb-qt/odb/qt/details/export.hxx | 34 | ||||
-rw-r--r-- | libodb-qt/odb/qt/version-build2-stub.hxx | 4 | ||||
-rw-r--r-- | libodb-qt/odb/qt/version-build2.hxx | 0 | ||||
-rw-r--r-- | libodb-qt/odb/qt/version.hxx | 55 | ||||
-rw-r--r-- | libodb-qt/odb/qt/version.hxx.in (renamed from libodb-qt/odb/qt/version-build2.hxx.in) | 43 |
13 files changed, 45 insertions, 200 deletions
diff --git a/libodb-qt/odb/qt/buildfile b/libodb-qt/odb/qt/buildfile index 63e6c95..7fb051b 100644 --- a/libodb-qt/odb/qt/buildfile +++ b/libodb-qt/odb/qt/buildfile @@ -20,17 +20,16 @@ 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} \ + 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) @@ -38,7 +37,7 @@ # Build options. # - cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_QT_BUILD2 + cxx.poptions =+ "-I$out_root" "-I$src_root" obja{*}: cxx.poptions += -DLIBODB_QT_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_QT_SHARED_BUILD @@ -47,7 +46,7 @@ # lib{odb-qt}: { - cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_QT_BUILD2 + cxx.export.poptions = "-I$out_root" "-I$src_root" cxx.export.libs = $int_libs } @@ -62,32 +61,5 @@ lib{odb-qt}: bin.lib.version = @"-$version.project_id" else lib{odb-qt}: bin.lib.version = @"-$version.major.$version.minor" - - # Installation tweaks. - # - 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 - - if ($cxx.target.system == 'win32-msvc') - { - h{config-vc}@./: install = $install_include/details/ - h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h - } - else - { - h{config}@./: install = $install_include/details/ - h{config-stub}@./: install = $install_include/details/build2/config.h - } - } } } diff --git a/libodb-qt/odb/qt/details/build2/config-stub.h b/libodb-qt/odb/qt/details/build2/config-stub.h deleted file mode 100644 index fbb2971..0000000 --- a/libodb-qt/odb/qt/details/build2/config-stub.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/qt/details/build2/config-stub.h - * license : GNU GPL v2; see accompanying LICENSE file - */ - -#include <odb/qt/details/config.h> diff --git a/libodb-qt/odb/qt/details/build2/config-vc-stub.h b/libodb-qt/odb/qt/details/build2/config-vc-stub.h deleted file mode 100644 index e6a412d..0000000 --- a/libodb-qt/odb/qt/details/build2/config-vc-stub.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/qt/details/build2/config-vc-stub.h - * license : GNU GPL v2; see accompanying LICENSE file - */ - -#include <odb/qt/details/config-vc.h> diff --git a/libodb-qt/odb/qt/details/build2/config-vc.h b/libodb-qt/odb/qt/details/build2/config-vc.h deleted file mode 100644 index 36113ce..0000000 --- a/libodb-qt/odb/qt/details/build2/config-vc.h +++ /dev/null @@ -1,15 +0,0 @@ -/* file : odb/qt/details/build2/config-vc.h - * license : GNU GPL v2; see accompanying LICENSE file - */ - -/* Configuration file for Windows/VC++ for the build2 build. */ - -#ifndef ODB_QT_DETAILS_CONFIG_VC_H -#define ODB_QT_DETAILS_CONFIG_VC_H - -/* Define LIBODB_QT_BUILD2 for the installed case. */ -#ifndef LIBODB_QT_BUILD2 -# define LIBODB_QT_BUILD2 -#endif - -#endif /* ODB_QT_DETAILS_CONFIG_VC_H */ diff --git a/libodb-qt/odb/qt/details/build2/config.h b/libodb-qt/odb/qt/details/build2/config.h deleted file mode 100644 index 12d168f..0000000 --- a/libodb-qt/odb/qt/details/build2/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* file : odb/qt/details/build2/config.h - * license : GNU GPL v2; see accompanying LICENSE file - */ - -/* Static configuration file for the build2 build. The installed case - (when LIBODB_QT_BUILD2 is not necessarily defined) is the only - reason we have it. */ - -#ifndef ODB_QT_DETAILS_CONFIG_H -#define ODB_QT_DETAILS_CONFIG_H - -/* Define LIBODB_QT_BUILD2 for the installed case. */ -#ifndef LIBODB_QT_BUILD2 -# define LIBODB_QT_BUILD2 -#endif - -#endif /* ODB_QT_DETAILS_CONFIG_H */ diff --git a/libodb-qt/odb/qt/details/config-vc.h b/libodb-qt/odb/qt/details/config-vc.h deleted file mode 100644 index 6718a07..0000000 --- a/libodb-qt/odb/qt/details/config-vc.h +++ /dev/null @@ -1,5 +0,0 @@ -/* file : odb/qt/details/config-vc.h - * license : GNU GPL v2; see accompanying LICENSE file - */ - -/* Dummy configuration file for Windows/VC++. */ diff --git a/libodb-qt/odb/qt/details/config.h.in b/libodb-qt/odb/qt/details/config.h.in deleted file mode 100644 index a0c3989..0000000 --- a/libodb-qt/odb/qt/details/config.h.in +++ /dev/null @@ -1,12 +0,0 @@ -/* file : odb/qt/details/config.h.in - * license : GNU GPL v2; see accompanying LICENSE file - */ - -/* This file is automatically processed by configure. */ - -#ifndef ODB_QT_DETAILS_CONFIG_H -#define ODB_QT_DETAILS_CONFIG_H - -#undef LIBODB_QT_STATIC_LIB - -#endif /* ODB_QT_DETAILS_CONFIG_H */ diff --git a/libodb-qt/odb/qt/details/config.hxx b/libodb-qt/odb/qt/details/config.hxx index 9077380..01a4eb5 100644 --- a/libodb-qt/odb/qt/details/config.hxx +++ b/libodb-qt/odb/qt/details/config.hxx @@ -24,13 +24,7 @@ # define __PIC__ # endif # endif -# define LIBODB_QT_STATIC_LIB -#elif !defined(LIBODB_QT_BUILD2) -# ifdef _MSC_VER -# include <odb/qt/details/config-vc.h> -# else -# include <odb/qt/details/config.h> -# endif +# define LIBODB_QT_STATIC #endif // no post diff --git a/libodb-qt/odb/qt/details/export.hxx b/libodb-qt/odb/qt/details/export.hxx index 4c0097f..f38d0ee 100644 --- a/libodb-qt/odb/qt/details/export.hxx +++ b/libodb-qt/odb/qt/details/export.hxx @@ -6,7 +6,7 @@ #include <odb/pre.hxx> -#include <odb/qt/details/config.hxx> +#include <odb/qt/details/config.hxx> // LIBODB_QT_STATIC if ODB_COMPILER // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting @@ -16,8 +16,6 @@ // used before their inline definition. The workaround is to reorder code. In // the end it's all trial and error. -#ifdef LIBODB_QT_BUILD2 - #if defined(LIBODB_QT_STATIC) // Using static. # define LIBODB_QT_EXPORT #elif defined(LIBODB_QT_STATIC_BUILD) // Building static. @@ -43,36 +41,6 @@ # define LIBODB_QT_EXPORT // Using static or shared. #endif -#else // LIBODB_QT_BUILD2 - -#ifdef LIBODB_QT_STATIC_LIB -# define LIBODB_QT_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBODB_QT_DYNAMIC_LIB -# define LIBODB_QT_EXPORT __declspec(dllexport) -# else -# define LIBODB_QT_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBODB_QT_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBODB_QT_EXPORT __declspec(dllexport) -# else -# define LIBODB_QT_EXPORT -# endif -# else -# define LIBODB_QT_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBODB_QT_EXPORT -# endif -#endif - -#endif // LIBODB_QT_BUILD2 - #include <odb/post.hxx> #endif // ODB_QT_DETAILS_EXPORT_HXX 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 |