13 files changed, 34 insertions, 183 deletions
diff --git a/libodb-pgsql/odb/pgsql/buildfile b/libodb-pgsql/odb/pgsql/buildfile
index f1d05b6..57d38f0 100644
--- a/libodb-pgsql/odb/pgsql/buildfile
+++ b/libodb-pgsql/odb/pgsql/buildfile
@@ -7,17 +7,16 @@ cli{*}: extension = cli
 import int_libs = libodb%lib{odb}
 import imp_libs = libpq%lib{pq}
 
-lib{odb-pgsql}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \
-        details/{hxx ixx txx cxx}{* -options}                              \
- details/build2/{h}{*}                                                     \
+lib{odb-pgsql}: {hxx ixx txx cxx}{* -version} {hxx}{version} \
+        details/{hxx ixx txx cxx}{* -options}                \
                 $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)
@@ -25,7 +24,7 @@ hxx{version-build2}:
 
 # Build options.
 #
-cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2
+cxx.poptions =+ "-I$out_root" "-I$src_root"
 
 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
 objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD
@@ -34,7 +33,7 @@ objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD
 #
 lib{odb-pgsql}:
 {
-  cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_PGSQL_BUILD2
+  cxx.export.poptions = "-I$out_root" "-I$src_root"
   cxx.export.libs = $int_libs
 }
 
@@ -131,25 +130,3 @@ install_include = [dir_path] include/odb/pgsql/
   install         = $install_include
   install.subdirs = true
 }
-
-# We want these to be picked up whether LIBODB_PGSQL_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-pgsql/odb/pgsql/details/build2/config-stub.h b/libodb-pgsql/odb/pgsql/details/build2/config-stub.h
deleted file mode 100644
index 00c5940..0000000
--- a/libodb-pgsql/odb/pgsql/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/pgsql/details/build2/config-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/pgsql/details/config.h>
diff --git a/libodb-pgsql/odb/pgsql/details/build2/config-vc-stub.h b/libodb-pgsql/odb/pgsql/details/build2/config-vc-stub.h
deleted file mode 100644
index 473cd96..0000000
--- a/libodb-pgsql/odb/pgsql/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/pgsql/details/build2/config-vc-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/pgsql/details/config-vc.h>
diff --git a/libodb-pgsql/odb/pgsql/details/build2/config-vc.h b/libodb-pgsql/odb/pgsql/details/build2/config-vc.h
deleted file mode 100644
index e9d9ade..0000000
--- a/libodb-pgsql/odb/pgsql/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file      : odb/pgsql/details/build2/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_PGSQL_DETAILS_CONFIG_VC_H
-#define ODB_PGSQL_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_PGSQL_BUILD2 for the installed case. */
-#ifndef LIBODB_PGSQL_BUILD2
-#  define LIBODB_PGSQL_BUILD2
-#endif
-
-#endif /* ODB_PGSQL_DETAILS_CONFIG_VC_H */
diff --git a/libodb-pgsql/odb/pgsql/details/build2/config.h b/libodb-pgsql/odb/pgsql/details/build2/config.h
deleted file mode 100644
index b2a81b5..0000000
--- a/libodb-pgsql/odb/pgsql/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file      : odb/pgsql/details/build2/config.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
-   (when LIBODB_PGSQL_BUILD2 is not necessarily defined) is the only
-   reason we have it. */
-
-#ifndef ODB_PGSQL_DETAILS_CONFIG_H
-#define ODB_PGSQL_DETAILS_CONFIG_H
-
-/* Define LIBODB_PGSQL_BUILD2 for the installed case. */
-#ifndef LIBODB_PGSQL_BUILD2
-#  define LIBODB_PGSQL_BUILD2
-#endif
-
-#endif /* ODB_PGSQL_DETAILS_CONFIG_H */
diff --git a/libodb-pgsql/odb/pgsql/details/config-vc.h b/libodb-pgsql/odb/pgsql/details/config-vc.h
deleted file mode 100644
index 77a0be5..0000000
--- a/libodb-pgsql/odb/pgsql/details/config-vc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/pgsql/details/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Dummy configuration file for Windows/VC++. */
diff --git a/libodb-pgsql/odb/pgsql/details/config.h.in b/libodb-pgsql/odb/pgsql/details/config.h.in
deleted file mode 100644
index 889023c..0000000
--- a/libodb-pgsql/odb/pgsql/details/config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* file      : odb/pgsql/details/config.h.in
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef ODB_PGSQL_DETAILS_CONFIG_H
-#define ODB_PGSQL_DETAILS_CONFIG_H
-
-#undef LIBODB_PGSQL_STATIC_LIB
-
-#endif /* ODB_PGSQL_DETAILS_CONFIG_H */
diff --git a/libodb-pgsql/odb/pgsql/details/config.hxx b/libodb-pgsql/odb/pgsql/details/config.hxx
index 1340622..5bed468 100644
--- a/libodb-pgsql/odb/pgsql/details/config.hxx
+++ b/libodb-pgsql/odb/pgsql/details/config.hxx
@@ -8,12 +8,6 @@
 
 #ifdef ODB_COMPILER
 #  error libodb-pgsql header included in odb-compiled header
-#elif !defined(LIBODB_PGSQL_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/pgsql/details/config-vc.h>
-#  else
-#    include <odb/pgsql/details/config.h>
-#  endif
 #endif
 
 // no post
diff --git a/libodb-pgsql/odb/pgsql/details/export.hxx b/libodb-pgsql/odb/pgsql/details/export.hxx
index 81ff6a0..73adc43 100644
--- a/libodb-pgsql/odb/pgsql/details/export.hxx
+++ b/libodb-pgsql/odb/pgsql/details/export.hxx
@@ -6,7 +6,11 @@
 
 #include <odb/pre.hxx>
 
-#include <odb/pgsql/details/config.hxx>
+// Note: do this check directly instead of including config.hxx.
+//
+#ifdef ODB_COMPILER
+#  error libodb-pgsql header included in odb-compiled header
+#endif
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -16,8 +20,6 @@
 // used before their inline definition. The workaround is to reorder code. In
 // the end it's all trial and error.
 
-#ifdef LIBODB_PGSQL_BUILD2
-
 #if defined(LIBODB_PGSQL_STATIC)         // Using static.
 #  define LIBODB_PGSQL_EXPORT
 #elif defined(LIBODB_PGSQL_STATIC_BUILD) // Building static.
@@ -43,36 +45,6 @@
 #  define LIBODB_PGSQL_EXPORT            // Using static or shared.
 #endif
 
-#else // LIBODB_PGSQL_BUILD2
-
-#ifdef LIBODB_PGSQL_STATIC_LIB
-#  define LIBODB_PGSQL_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBODB_PGSQL_DYNAMIC_LIB
-#        define LIBODB_PGSQL_EXPORT __declspec(dllexport)
-#      else
-#        define LIBODB_PGSQL_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBODB_PGSQL_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBODB_PGSQL_EXPORT __declspec(dllexport)
-#        else
-#          define LIBODB_PGSQL_EXPORT
-#        endif
-#      else
-#        define LIBODB_PGSQL_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBODB_PGSQL_EXPORT
-#  endif
-#endif
-
-#endif // LIBODB_PGSQL_BUILD2
-
 #include <odb/post.hxx>
 
 #endif // ODB_PGSQL_DETAILS_EXPORT_HXX
diff --git a/libodb-pgsql/odb/pgsql/version-build2-stub.hxx b/libodb-pgsql/odb/pgsql/version-build2-stub.hxx
deleted file mode 100644
index a99b093..0000000
--- a/libodb-pgsql/odb/pgsql/version-build2-stub.hxx
+++ /dev/null
@@ -1,4 +0,0 @@
-// file      : odb/pgsql/version-build2-stub.hxx
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#include <odb/pgsql/version.hxx>
diff --git a/libodb-pgsql/odb/pgsql/version-build2.hxx b/libodb-pgsql/odb/pgsql/version-build2.hxx
deleted file mode 100644
index e69de29..0000000
--- a/libodb-pgsql/odb/pgsql/version-build2.hxx
+++ /dev/null
diff --git a/libodb-pgsql/odb/pgsql/version.hxx b/libodb-pgsql/odb/pgsql/version.hxx
index e050de4..e69de29 100644
--- a/libodb-pgsql/odb/pgsql/version.hxx
+++ b/libodb-pgsql/odb/pgsql/version.hxx
@@ -1,48 +0,0 @@
-// file      : odb/pgsql/version.hxx
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifdef LIBODB_PGSQL_BUILD2
-#  include <odb/pgsql/version-build2.hxx>
-#else
-
-#ifndef ODB_PGSQL_VERSION_HXX
-#define ODB_PGSQL_VERSION_HXX
-
-#include <odb/pre.hxx>
-
-#include <odb/pgsql/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-pgsql version: odb interface version plus the bugfix
-// version.
-//
-#define LIBODB_PGSQL_VERSION     2049976
-#define LIBODB_PGSQL_VERSION_STR "2.5.0-b.26"
-
-#include <odb/post.hxx>
-
-#endif // ODB_PGSQL_VERSION_HXX
-#endif // LIBODB_PGSQL_BUILD2
diff --git a/libodb-pgsql/odb/pgsql/version-build2.hxx.in b/libodb-pgsql/odb/pgsql/version.hxx.in
index ed4396b..db8b152 100644
--- a/libodb-pgsql/odb/pgsql/version-build2.hxx.in
+++ b/libodb-pgsql/odb/pgsql/version.hxx.in
@@ -1,9 +1,9 @@
-// file      : odb/pgsql/version-build2.hxx.in
+// file      : odb/pgsql/version.hxx.in
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #ifndef LIBODB_PGSQL_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_PGSQL_VERSION       $libodb_pgsql.version.project_number$ULL
+#define LIBODB_PGSQL_VERSION_FULL  $libodb_pgsql.version.project_number$ULL
 #define LIBODB_PGSQL_VERSION_STR   "$libodb_pgsql.version.project$"
 #define LIBODB_PGSQL_VERSION_ID    "$libodb_pgsql.version.project_id$"
 
@@ -37,6 +37,25 @@
 
 #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_PGSQL_VERSION 2049976
 
 #endif // LIBODB_PGSQL_VERSION