summaryrefslogtreecommitdiff
path: root/libodb-boost
diff options
context:
space:
mode:
Diffstat (limited to 'libodb-boost')
-rw-r--r--libodb-boost/odb/boost/buildfile42
-rw-r--r--libodb-boost/odb/boost/details/build2/config-stub.h5
-rw-r--r--libodb-boost/odb/boost/details/build2/config-vc-stub.h5
-rw-r--r--libodb-boost/odb/boost/details/build2/config-vc.h15
-rw-r--r--libodb-boost/odb/boost/details/build2/config.h17
-rw-r--r--libodb-boost/odb/boost/details/config-vc.h5
-rw-r--r--libodb-boost/odb/boost/details/config.h.in12
-rw-r--r--libodb-boost/odb/boost/details/config.hxx8
-rw-r--r--libodb-boost/odb/boost/details/export.hxx34
-rw-r--r--libodb-boost/odb/boost/version-build2-stub.hxx4
-rw-r--r--libodb-boost/odb/boost/version-build2.hxx0
-rw-r--r--libodb-boost/odb/boost/version.hxx55
-rw-r--r--libodb-boost/odb/boost/version.hxx.in (renamed from libodb-boost/odb/boost/version-build2.hxx.in)44
13 files changed, 45 insertions, 201 deletions
diff --git a/libodb-boost/odb/boost/buildfile b/libodb-boost/odb/boost/buildfile
index 751b56e..b8dd6d1 100644
--- a/libodb-boost/odb/boost/buildfile
+++ b/libodb-boost/odb/boost/buildfile
@@ -20,17 +20,16 @@
import int_libs = libodb%lib{odb}
imp_libs =
- lib{odb-boost}: {hxx ixx txx cxx}{** -version-build2} {hxx}{version-build2} \
- details/build2/{h}{*} \
- options{**} ../options{boost} \
- $imp_libs $int_libs
+ lib{odb-boost}: {hxx ixx txx cxx}{** -version} hxx{version} \
+ options{**} ../options{boost} \
+ $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)
@@ -47,7 +46,7 @@
# Build options.
#
- cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_BOOST_BUILD2
+ cxx.poptions =+ "-I$out_root" "-I$src_root"
obja{*}: cxx.poptions += -DLIBODB_BOOST_STATIC_BUILD
objs{*}: cxx.poptions += -DLIBODB_BOOST_SHARED_BUILD
@@ -56,38 +55,11 @@
#
lib{odb-boost}:
{
- cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_BOOST_BUILD2
+ cxx.export.poptions = "-I$out_root" "-I$src_root"
cxx.export.libs = $int_libs
}
liba{odb-boost}: cxx.export.poptions += -DLIBODB_BOOST_STATIC
libs{odb-boost}: cxx.export.poptions += -DLIBODB_BOOST_SHARED
-
- # Installation tweaks.
- #
- install_include = [dir_path] include/odb/boost/
-
- # We want these to be picked up whether LIBODB_BOOST_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-boost/odb/boost/details/build2/config-stub.h b/libodb-boost/odb/boost/details/build2/config-stub.h
deleted file mode 100644
index 6f5f461..0000000
--- a/libodb-boost/odb/boost/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file : odb/boost/details/build2/config-stub.h
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/boost/details/config.h>
diff --git a/libodb-boost/odb/boost/details/build2/config-vc-stub.h b/libodb-boost/odb/boost/details/build2/config-vc-stub.h
deleted file mode 100644
index c6650f3..0000000
--- a/libodb-boost/odb/boost/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file : odb/boost/details/build2/config-vc-stub.h
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/boost/details/config-vc.h>
diff --git a/libodb-boost/odb/boost/details/build2/config-vc.h b/libodb-boost/odb/boost/details/build2/config-vc.h
deleted file mode 100644
index 5cdff2b..0000000
--- a/libodb-boost/odb/boost/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file : odb/boost/details/build2/config-vc.h
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_VC_H
-#define ODB_BOOST_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_BOOST_BUILD2 for the installed case. */
-#ifndef LIBODB_BOOST_BUILD2
-# define LIBODB_BOOST_BUILD2
-#endif
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_VC_H */
diff --git a/libodb-boost/odb/boost/details/build2/config.h b/libodb-boost/odb/boost/details/build2/config.h
deleted file mode 100644
index ea24ba3..0000000
--- a/libodb-boost/odb/boost/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file : odb/boost/details/build2/config.h
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
- (when LIBODB_BOOST_BUILD2 is not necessarily defined) is the only
- reason we have it. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_H
-#define ODB_BOOST_DETAILS_CONFIG_H
-
-/* Define LIBODB_BOOST_BUILD2 for the installed case. */
-#ifndef LIBODB_BOOST_BUILD2
-# define LIBODB_BOOST_BUILD2
-#endif
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_H */
diff --git a/libodb-boost/odb/boost/details/config-vc.h b/libodb-boost/odb/boost/details/config-vc.h
deleted file mode 100644
index 687a1e1..0000000
--- a/libodb-boost/odb/boost/details/config-vc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file : odb/boost/details/config-vc.h
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Dummy configuration file for Windows/VC++. */
diff --git a/libodb-boost/odb/boost/details/config.h.in b/libodb-boost/odb/boost/details/config.h.in
deleted file mode 100644
index 3cfc3aa..0000000
--- a/libodb-boost/odb/boost/details/config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* file : odb/boost/details/config.h.in
- * license : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_H
-#define ODB_BOOST_DETAILS_CONFIG_H
-
-#undef LIBODB_BOOST_STATIC_LIB
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_H */
diff --git a/libodb-boost/odb/boost/details/config.hxx b/libodb-boost/odb/boost/details/config.hxx
index f0fe850..d5ddef8 100644
--- a/libodb-boost/odb/boost/details/config.hxx
+++ b/libodb-boost/odb/boost/details/config.hxx
@@ -7,13 +7,7 @@
// no pre
#ifdef ODB_COMPILER
-# define LIBODB_BOOST_STATIC_LIB
-#elif !defined(LIBODB_BOOST_BUILD2)
-# ifdef _MSC_VER
-# include <odb/boost/details/config-vc.h>
-# else
-# include <odb/boost/details/config.h>
-# endif
+# define LIBODB_BOOST_STATIC
#endif
// no post
diff --git a/libodb-boost/odb/boost/details/export.hxx b/libodb-boost/odb/boost/details/export.hxx
index cb3b219..fa4e53c 100644
--- a/libodb-boost/odb/boost/details/export.hxx
+++ b/libodb-boost/odb/boost/details/export.hxx
@@ -6,7 +6,7 @@
#include <odb/pre.hxx>
-#include <odb/boost/details/config.hxx>
+#include <odb/boost/details/config.hxx> // LIBODB_BOOST_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_BOOST_BUILD2
-
#if defined(LIBODB_BOOST_STATIC) // Using static.
# define LIBODB_BOOST_EXPORT
#elif defined(LIBODB_BOOST_STATIC_BUILD) // Building static.
@@ -43,36 +41,6 @@
# define LIBODB_BOOST_EXPORT // Using static or shared.
#endif
-#else // LIBODB_BOOST_BUILD2
-
-#ifdef LIBODB_BOOST_STATIC_LIB
-# define LIBODB_BOOST_EXPORT
-#else
-# ifdef _WIN32
-# ifdef _MSC_VER
-# ifdef LIBODB_BOOST_DYNAMIC_LIB
-# define LIBODB_BOOST_EXPORT __declspec(dllexport)
-# else
-# define LIBODB_BOOST_EXPORT __declspec(dllimport)
-# endif
-# else
-# ifdef LIBODB_BOOST_DYNAMIC_LIB
-# ifdef DLL_EXPORT
-# define LIBODB_BOOST_EXPORT __declspec(dllexport)
-# else
-# define LIBODB_BOOST_EXPORT
-# endif
-# else
-# define LIBODB_BOOST_EXPORT __declspec(dllimport)
-# endif
-# endif
-# else
-# define LIBODB_BOOST_EXPORT
-# endif
-#endif
-
-#endif // LIBODB_BOOST_BUILD2
-
#include <odb/post.hxx>
#endif // ODB_BOOST_DETAILS_EXPORT_HXX
diff --git a/libodb-boost/odb/boost/version-build2-stub.hxx b/libodb-boost/odb/boost/version-build2-stub.hxx
deleted file mode 100644
index e29f23c..0000000
--- a/libodb-boost/odb/boost/version-build2-stub.hxx
+++ /dev/null
@@ -1,4 +0,0 @@
-// file : odb/boost/version-build2-stub.hxx
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#include <odb/boost/version.hxx>
diff --git a/libodb-boost/odb/boost/version-build2.hxx b/libodb-boost/odb/boost/version-build2.hxx
deleted file mode 100644
index e69de29..0000000
--- a/libodb-boost/odb/boost/version-build2.hxx
+++ /dev/null
diff --git a/libodb-boost/odb/boost/version.hxx b/libodb-boost/odb/boost/version.hxx
index c46e21a..e69de29 100644
--- a/libodb-boost/odb/boost/version.hxx
+++ b/libodb-boost/odb/boost/version.hxx
@@ -1,55 +0,0 @@
-// file : odb/boost/version.hxx
-// license : GNU GPL v2; see accompanying LICENSE file
-
-#ifdef LIBODB_BOOST_BUILD2
-# include <odb/boost/version-build2.hxx>
-#else
-
-#ifndef ODB_BOOST_VERSION_HXX
-#define ODB_BOOST_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 Boost interface version: odb interface version plus the Boost interface
-// version.
-//
-#define ODB_BOOST_VERSION 2047600
-#define ODB_BOOST_VERSION_STR "2.5.0-b.26"
-
-// libodb-boost version: odb interface version plus the bugfix version. Note
-// that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION
-// since if the Boost interface virsion is incremented then the bugfix version
-// must be incremented as well.
-//
-#define LIBODB_BOOST_VERSION 2049976
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.26"
-
-#include <odb/post.hxx>
-
-#endif // ODB_BOOST_VERSION_HXX
-#endif // LIBODB_BOOST_BUILD2
diff --git a/libodb-boost/odb/boost/version-build2.hxx.in b/libodb-boost/odb/boost/version.hxx.in
index 37a1ffc..15aed4e 100644
--- a/libodb-boost/odb/boost/version-build2.hxx.in
+++ b/libodb-boost/odb/boost/version.hxx.in
@@ -1,13 +1,9 @@
-// file : odb/boost/version-build2.hxx.in
+// file : odb/boost/version.hxx.in
// license : GNU GPL v2; see accompanying LICENSE file
#ifndef LIBODB_BOOST_VERSION // Note: using the version macro itself.
-// @@ TODO: need to derive automatically (it is also hardcoded in *.options).
-//
-#define ODB_BOOST_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_BOOST_VERSION $libodb_boost.version.project_number$ULL
+#define LIBODB_BOOST_VERSION_FULL $libodb_boost.version.project_number$ULL
#define LIBODB_BOOST_VERSION_STR "$libodb_boost.version.project$"
#define LIBODB_BOOST_VERSION_ID "$libodb_boost.version.project_id$"
@@ -41,6 +37,38 @@
#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
+//
+
+// ODB Boost interface version: odb interface version plus the Boost interface
+// version.
+//
+// NOTE: also hardcoded in *.options.
+//
+#define ODB_BOOST_VERSION 2047600
+#define ODB_BOOST_VERSION_STR "2.5.0-b.26"
+
+// libodb-boost version: odb interface version plus the bugfix version. Note
+// that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION
+// since if the Boost interface virsion is incremented then the bugfix version
+// must be incremented as well.
+//
+#define LIBODB_BOOST_VERSION 2049976
#endif // LIBODB_BOOST_VERSION
generated by cgit v1.1 at 2024-06-12 15:30:28 +0000