diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-29 13:17:26 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-29 13:17:26 +0200 |
commit | b62164b756ba79b92bef4082e2f988e72c9cc525 (patch) | |
tree | 0fefc8fb4ea404a6b72f4fac38102c541eea7645 /libodb-qt | |
parent | b474ec02f806b7a7bcd9efa6f2198f0e314db75e (diff) |
Get rid of dual config support and _BUILD2 macro in runtime librariesmulti-package-version
Diffstat (limited to 'libodb-qt')
-rw-r--r-- | libodb-qt/odb/qt/buildfile | 25 | ||||
-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 |
9 files changed, 4 insertions, 122 deletions
diff --git a/libodb-qt/odb/qt/buildfile b/libodb-qt/odb/qt/buildfile index 98afecd..7fb051b 100644 --- a/libodb-qt/odb/qt/buildfile +++ b/libodb-qt/odb/qt/buildfile @@ -21,7 +21,6 @@ imp_libs = lib{odb-qt}: {hxx ixx txx cxx}{** -version} {hxx}{version} \ - details/build2/{h}{*} \ options{**} ../options{qt} \ $imp_libs $int_libs @@ -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,25 +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/ - - 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 |