aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-14 12:21:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-14 12:21:54 +0200
commitffb9168aa83b8d61dd4af2d9516b14eb657ce08a (patch)
tree24692eb6816a5b7d6b27d3a83dc300692e6c5ef9
parent2ce1b689c40e1fed002c960f1fbbee5058ed1627 (diff)
Initial build2 build support
-rw-r--r--.gitignore10
-rw-r--r--build/bootstrap.build18
-rw-r--r--build/export.build10
-rw-r--r--build/root.build9
-rw-r--r--buildfile9
-rw-r--r--manifest15
-rw-r--r--odb/pgsql/buildfile109
-rw-r--r--odb/pgsql/details/build2/config-vc.h16
-rw-r--r--odb/pgsql/details/build2/config.h18
-rw-r--r--odb/pgsql/details/export.hxx39
-rw-r--r--tests/basics/buildfile8
-rw-r--r--tests/basics/driver.cxx38
-rw-r--r--tests/build/bootstrap.build9
-rw-r--r--tests/build/root.build11
-rw-r--r--tests/buildfile7
15 files changed, 325 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3b9998d..209706c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,17 @@
# Compiler/linker output.
#
+*.d
*.o
-*.o.d
+*.obj
*.so
+*.dll
*.a
+*.lib
+*.exp
+*.exe
+*.exe.dlls/
+*.exe.manifest
+
*.l
*.l.cpp-options
diff --git a/build/bootstrap.build b/build/bootstrap.build
new file mode 100644
index 0000000..79cffda
--- /dev/null
+++ b/build/bootstrap.build
@@ -0,0 +1,18 @@
+# file : build/bootstrap.build
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+project = libodb-pgsql
+version = 2.5.0-a9
+revision = 0
+
+using build@0.4.0-a1
+using config
+using dist
+using test
+using install
+
+dist.package = $project-$version
+
+if ($revision != 0)
+ dist.package += +$revision
diff --git a/build/export.build b/build/export.build
new file mode 100644
index 0000000..b415d43
--- /dev/null
+++ b/build/export.build
@@ -0,0 +1,10 @@
+# file : build/export.build
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+$out_root/:
+{
+ include odb/pgsql/
+}
+
+export $out_root/odb/pgsql/lib{odb-pgsql}
diff --git a/build/root.build b/build/root.build
new file mode 100644
index 0000000..174f292
--- /dev/null
+++ b/build/root.build
@@ -0,0 +1,9 @@
+# file : build/root.build
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+using cxx
+
+cxx.std = 11
+
+tests/: install = false # Don't install tests.
diff --git a/buildfile b/buildfile
new file mode 100644
index 0000000..ac2a27d
--- /dev/null
+++ b/buildfile
@@ -0,0 +1,9 @@
+# file : buildfile
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+d = odb/pgsql/ tests/
+./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest}
+include $d
+
+doc{INSTALL}@./: install = false
diff --git a/manifest b/manifest
new file mode 100644
index 0000000..0553e5c
--- /dev/null
+++ b/manifest
@@ -0,0 +1,15 @@
+: 1
+name: libodb-pgsql
+version: 2.5.0-a9
+summary: PostgreSQL ODB runtime library
+license: GPLv2
+license: proprietary
+tags: c++, orm, postgres, database, relational, object, persistence, sql
+description-file: README
+changes-file: NEWS
+url: http://www.codesynthesis.com/products/odb/
+email: odb-users@codesynthesis.com
+requires: c++11
+requires: build2 >= 0.4.0-a1
+depends: libpq >= 9.0.0
+depends: libodb == 2.5.0-a9
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile
new file mode 100644
index 0000000..7155df0
--- /dev/null
+++ b/odb/pgsql/buildfile
@@ -0,0 +1,109 @@
+# file : odb/pgsql/buildfile
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+# @@ On Debian libpq's headers are in /usr/include/postgresql. There is
+# pkg-config support.
+#
+
+import libs = libpq%lib{pq}
+import libs += libodb%lib{odb}
+
+lib{odb-pgsql}: \
+ {hxx cxx}{ auto-handle } \
+ {hxx }{ binding } \
+ {hxx ixx cxx}{ connection } \
+ {hxx cxx}{ connection-factory } \
+ {hxx txx }{ container-statements } \
+ {hxx ixx cxx}{ database } \
+ {hxx ixx cxx}{ error } \
+ {hxx cxx}{ exceptions } \
+ {hxx }{ forward } \
+ {hxx txx }{ no-id-object-result } \
+ {hxx txx }{ no-id-object-statements } \
+ {hxx }{ pgsql-fwd } \
+ {hxx }{ pgsql-oid } \
+ {hxx }{ pgsql-types } \
+ {hxx txx }{ polymorphic-object-result } \
+ {hxx txx }{ polymorphic-object-statements } \
+ {hxx cxx}{ prepared-query } \
+ {hxx ixx txx cxx}{ query } \
+ { cxx}{ query-const-expr } \
+ {hxx ixx txx cxx}{ query-dynamic } \
+ {hxx txx }{ section-statements } \
+ {hxx txx }{ simple-object-result } \
+ {hxx ixx txx cxx}{ simple-object-statements } \
+ {hxx txx }{ statement-cache } \
+ {hxx cxx}{ statement } \
+ {hxx cxx}{ statements-base } \
+ {hxx cxx}{ tracer } \
+ {hxx cxx}{ traits } \
+ {hxx }{ traits-calls } \
+ {hxx ixx cxx}{ transaction } \
+ {hxx ixx cxx}{ transaction-impl } \
+ {hxx }{ version } \
+ {hxx txx }{ view-result } \
+ {hxx txx }{ view-statements } \
+ details/{hxx }{ config } \
+ details/{hxx }{ conversion } \
+ details/{hxx cxx}{ endian-traits } \
+ details/{hxx }{ export } \
+ details/{hxx ixx cxx}{ options } \
+details/build2/{h }{ config } \
+details/build2/{h }{ config-vc } \
+ $libs
+
+cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2
+obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD
+
+lib{odb-pgsql}: cxx.export.poptions = -I$src_root -DLIBODB_PGSQL_BUILD2
+liba{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_STATIC
+libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED
+
+# Load the cli module but only if it's available. This way a distribution that
+# includes pre-generated files can be built without installing cli.
+#
+using? cli
+
+if! $cli.loaded
+{
+ define cli: file
+ cli{*}: extension = cli
+}
+
+details/:
+{
+ {hxx ixx cxx}{options}: cli{options}
+
+ cli.options += --include-with-brackets --include-prefix odb/pgsql/details \
+--guard-prefix LIBODB_PGSQL_DETAILS --generate-file-scanner \
+--cli-namespace odb::pgsql::details::cli --long-usage --generate-specifier
+
+ # Include generated cli files into the distribution. But don't install them
+ # since they are only used internally in the database implementation.
+ #
+ {hxx ixx cxx}{options}: dist = true
+ {hxx ixx}{options}: install = false
+}
+
+# Install into the odb/pgsql/ subdirectory of, say, /usr/include/.
+#
+install.include = $install.include/odb/pgsql/
+install.include.subdirs = true # Recreate subdirectories.
+
+# We want these to be picked up even when LIBODB_PGSQL_BUILD2 is not defined.
+#
+details/build2/:
+{
+ if ($cxx.id == "msvc")
+ {
+ h{config}@./: install = false
+ h{config-vc}@./: install = $install.include/details
+ }
+ else
+ {
+ h{config}@./: install = $install.include/details
+ h{config-vc}@./: install = false
+ }
+}
diff --git a/odb/pgsql/details/build2/config-vc.h b/odb/pgsql/details/build2/config-vc.h
new file mode 100644
index 0000000..35ebb42
--- /dev/null
+++ b/odb/pgsql/details/build2/config-vc.h
@@ -0,0 +1,16 @@
+/* file : odb/pgsql/details/build2/config-vc.h
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * 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/odb/pgsql/details/build2/config.h b/odb/pgsql/details/build2/config.h
new file mode 100644
index 0000000..1983f05
--- /dev/null
+++ b/odb/pgsql/details/build2/config.h
@@ -0,0 +1,18 @@
+/* file : odb/pgsql/details/build2/config.h
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * 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/odb/pgsql/details/export.hxx b/odb/pgsql/details/export.hxx
index a4bb3f5..513ab58 100644
--- a/odb/pgsql/details/export.hxx
+++ b/odb/pgsql/details/export.hxx
@@ -9,6 +9,43 @@
#include <odb/pgsql/details/config.hxx>
+// Normally we don't export class templates (but do complete specializations),
+// inline functions, and classes with only inline member functions. Exporting
+// classes that inherit from non-exported/imported bases (e.g., std::string)
+// will end up badly. The only known workarounds are to not inherit or to not
+// export. Also, MinGW GCC doesn't like seeing non-exported function being
+// 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.
+# define LIBODB_PGSQL_EXPORT
+#elif defined(LIBODB_PGSQL_SHARED) // Using shared.
+# ifdef _WIN32
+# define LIBODB_PGSQL_EXPORT __declspec(dllimport)
+# else
+# define LIBODB_PGSQL_EXPORT
+# endif
+#elif defined(LIBODB_PGSQL_SHARED_BUILD) // Building shared.
+# ifdef _WIN32
+# define LIBODB_PGSQL_EXPORT __declspec(dllexport)
+# else
+# define LIBODB_PGSQL_EXPORT
+# endif
+#else
+// If none of the above macros are defined, then we assume we are being used
+// by some third-party build system that cannot/doesn't signal the library
+// type. Note that this fallback works for both static and shared but in case
+// of shared will be sub-optimal compared to having dllimport.
+//
+# define LIBODB_PGSQL_EXPORT // Using static or shared.
+#endif
+
+#else // LIBODB_PGSQL_BUILD2
+
#ifdef LIBODB_PGSQL_STATIC_LIB
# define LIBODB_PGSQL_EXPORT
#else
@@ -35,6 +72,8 @@
# endif
#endif
+#endif // LIBODB_PGSQL_BUILD2
+
#include <odb/post.hxx>
#endif // ODB_PGSQL_DETAILS_EXPORT_HXX
diff --git a/tests/basics/buildfile b/tests/basics/buildfile
new file mode 100644
index 0000000..3be5ecc
--- /dev/null
+++ b/tests/basics/buildfile
@@ -0,0 +1,8 @@
+# file : tests/basics/buildfile
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+import libs = libodb%lib{odb} # @@
+import libs += libodb-pgsql%lib{odb-pgsql}
+
+exe{driver}: cxx{driver} $libs
diff --git a/tests/basics/driver.cxx b/tests/basics/driver.cxx
new file mode 100644
index 0000000..609975d
--- /dev/null
+++ b/tests/basics/driver.cxx
@@ -0,0 +1,38 @@
+// file : tests/basics/driver.cxx
+// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// Basic test to make sure the library is usable. Functionality testing
+// is done in the odb-tests package.
+
+#include <cassert>
+#include <sstream>
+
+#include <odb/pgsql/database.hxx>
+#include <odb/pgsql/exceptions.hxx>
+#include <odb/pgsql/transaction.hxx>
+
+using namespace odb::pgsql;
+
+int
+main ()
+{
+ {
+ std::ostringstream os;
+ database::print_usage (os);
+ assert (!os.str ().empty ());
+ }
+
+ // We can't really do much here since that would require a database. We can
+ // create a fake database object as long as we don't expect to get a valid
+ // connection.
+ //
+ database db ("john", "secret", "dummy whammy");
+
+ try
+ {
+ transaction t (db.begin ());
+ assert (false);
+ }
+ catch (const database_exception&) {}
+}
diff --git a/tests/build/bootstrap.build b/tests/build/bootstrap.build
new file mode 100644
index 0000000..2f8aad2
--- /dev/null
+++ b/tests/build/bootstrap.build
@@ -0,0 +1,9 @@
+# file : tests/build/bootstrap.build
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+project = # Unnamed subproject.
+
+using config
+using dist
+using test
diff --git a/tests/build/root.build b/tests/build/root.build
new file mode 100644
index 0000000..9d11dd5
--- /dev/null
+++ b/tests/build/root.build
@@ -0,0 +1,11 @@
+# file : tests/build/root.build
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+using cxx
+
+cxx.std = 11
+
+# Every exe{} in this subproject is by default a test.
+#
+exe{*}: test = true
diff --git a/tests/buildfile b/tests/buildfile
new file mode 100644
index 0000000..0341b61
--- /dev/null
+++ b/tests/buildfile
@@ -0,0 +1,7 @@
+# file : tests/buildfile
+# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+d = basics/
+./: $d
+include $d