Switch to build2

6 files changed, 122 insertions, 169 deletions

diff --git a/common/section/polymorphism/buildfile b/common/section/polymorphism/buildfile
new file mode 100644
index 0000000..b9a7514
--- /dev/null
+++ b/common/section/polymorphism/buildfile
@@ -0,0 +1,41 @@
+# file      : common/section/polymorphism/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+import libodb = libodb%lib{odb}
+
+libs =
+
+for db: $databases
+  import libs += libodb-$db%lib{odb-$db}
+
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-odb -*-odb-*} {hxx ixx cxx}{test-odb} testscript
+
+# Introduce the metadata library target to make sure the libodb library is
+# resolved for the odb_compile ad hoc rule (see build/root.build for details).
+#
+libue{test-meta}: $libodb
+
+<{hxx ixx cxx}{test-odb}>: hxx{test} libue{test-meta}
+
+for db: $databases
+{
+  exe{driver}: {hxx ixx cxx}{test-odb-$db}: include = $multi
+  <{hxx ixx cxx}{test-odb-$db}>: hxx{test} libue{test-meta}
+}
+
+exe{driver}: libue{test-meta} $libs
+
+# Specify the ODB custom options to be used by the odb_compile ad hoc rule
+# (see build/root.build for details).
+#
+odb_options = --table-prefix t_section_p_ \
+              --generate-schema           \
+              --generate-query
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/common/section/polymorphism/driver.cxx b/common/section/polymorphism/driver.cxx
index 321b852..c15d317 100644
--- a/common/section/polymorphism/driver.cxx
+++ b/common/section/polymorphism/driver.cxx
@@ -4,19 +4,21 @@
 // Test sections in polymorphic objects.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/session.hxx>
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 
@@ -27,7 +29,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test basic polymorphic section functionality.
     //
@@ -59,8 +61,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pb->rs1.loaded ());
         assert (!pb->rs2.loaded ());
@@ -177,8 +179,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pb, pb->rs1);
         db->load (*pb, pb->rs2);
@@ -252,8 +254,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pb, pb->rs1);
         db->load (*pb, pb->rs2);
@@ -312,8 +314,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pb, pb->rs1);
         db->load (*pb, pb->rs2);
@@ -369,7 +371,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pd->s.loaded ());
         assert (pd->sn != d.sn && pd->sv != d.sv);
@@ -396,7 +398,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         base* pb (pd.get ());
         db->load (*pb, pb->s); // Via base.
@@ -419,7 +421,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pd, pd->s);
 
@@ -434,7 +436,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pd, pd->s);
 
@@ -482,9 +484,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<root> pr (db->load<root> (r.id));
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<root> pr (db->load<root> (r.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pr->s1.loaded ());
         assert (!pr->s2.loaded ());
@@ -595,9 +597,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<root> pr (db->load<root> (r.id));
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<root> pr (db->load<root> (r.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pr, pr->s1);
         db->load (*pr, pr->s2);
@@ -674,9 +676,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<root> pr (db->load<root> (r.id));
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<root> pr (db->load<root> (r.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pr, pr->s1);
         db->load (*pr, pr->s2);
@@ -733,9 +735,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<root> pr (db->load<root> (r.id));
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<root> pr (db->load<root> (r.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->load (*pr, pr->s1);
         db->load (*pr, pr->s2);
@@ -808,8 +810,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pb->rs1.loaded ());
         assert (!pb->rs2.loaded ());
@@ -904,8 +906,8 @@ main (int argc, char* argv[])
         d1.ds1v[0]++;
 
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (b1);
         db->update (d1);
@@ -1023,8 +1025,8 @@ main (int argc, char* argv[])
       for (unsigned short s (1); s < 7; ++s)
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         switch (s)
         {
@@ -1311,8 +1313,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pb->s.loaded ());
         assert (!pd->s.loaded ());
@@ -1338,7 +1340,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (d1);
 
@@ -1370,7 +1372,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (b1, b1.s); // No-op.
         db->update (d1, d1.s);
@@ -1439,7 +1441,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (pd->s.loaded ());
         assert (pd->sn == d.sn);
@@ -1526,8 +1528,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<base> pb (db->load<base> (b.id));
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<base> pb (db->load<base> (b.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pb->s.loaded ());
         assert (!pd->s.loaded ());
@@ -1553,7 +1555,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (d1);
 
@@ -1585,7 +1587,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (b1, b1.s); // No-op.
         db->update (d1, d1.s);
@@ -1653,7 +1655,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         assert (!pd->s.loaded ());
         assert (pd->sn != d.sn);
@@ -1674,7 +1676,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (d1);
 
@@ -1706,7 +1708,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<derived> pd (db->load<derived> (d.id));
+        unique_ptr<derived> pd (db->load<derived> (d.id));
 
         db->update (d1, d1.s);
         assert (d.v != d1.v);
@@ -1754,7 +1756,6 @@ main (int argc, char* argv[])
       }
     }
 
-#ifdef HAVE_CXX11
     // Test reuse/polymorphic inheritance and optimistic mix.
     //
     {
@@ -1797,7 +1798,6 @@ main (int argc, char* argv[])
         t.commit ();
       }
     }
-#endif
   }
   catch (const odb::exception& e)
   {
diff --git a/common/section/polymorphism/makefile b/common/section/polymorphism/makefile
deleted file mode 100644
index 5b7db2d..0000000
--- a/common/section/polymorphism/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/section/polymorphism/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test.hxx
-genf    := $(call odb-gen,$(odb_hdr))
-gen     := $(addprefix $(out_base)/,$(genf))
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --generate-schema --generate-query \
---table-prefix t_section_p_
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-ifneq ($(db_id),common)
-$(gen): odb_options += --database $(db_id)
-else
-$(gen): odb_options += --multi-database dynamic
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): data_dist := test.std
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(data_dist) $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../../template/Makefile.am)
-	$(call meta-vc8projs,../../template/template,$(name))
-	$(call meta-vc9projs,../../template/template,$(name))
-	$(call meta-vc10projs,../../template/template,$(name))
-	$(call meta-vc11projs,../../template/template,$(name))
-	$(call meta-vc12projs,../../template/template,$(name))
-
-# Test.
-#
-ifneq ($(db_id),common)
-$(eval $(call test-rule))
-else
-$(foreach d,$(databases),$(eval $(call test-rule,$d)))
-endif
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/section/polymorphism/test.hxx b/common/section/polymorphism/test.hxx
index 7db7118..6d524bd 100644
--- a/common/section/polymorphism/test.hxx
+++ b/common/section/polymorphism/test.hxx
@@ -4,8 +4,6 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11
-
 #include <string>
 #include <vector>
 #include <memory>
@@ -501,7 +499,6 @@ namespace test8
 // objects derive polymorphically from the same base (and thus shared the id
 // bindind).
 //
-#ifdef HAVE_CXX11
 #pragma db namespace table("t9_")
 namespace test9
 {
@@ -541,6 +538,5 @@ namespace test9
     elements e2;
   };
 }
-#endif
 
 #endif // TEST_HXX
diff --git a/common/section/polymorphism/test.std b/common/section/polymorphism/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/section/polymorphism/test.std
+++ /dev/null
diff --git a/common/section/polymorphism/testscript b/common/section/polymorphism/testscript
new file mode 100644
index 0000000..f2cd536
--- /dev/null
+++ b/common/section/polymorphism/testscript
@@ -0,0 +1,33 @@
+# file      : common/section/polymorphism/testscript
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../../database-options.testscript
+
+: mysql
+:
+if $mysql
+{
+  .include ../../../mysql.testscript
+
+  $create_schema;
+  $*
+}
+
+: sqlite
+:
+if $sqlite
+{
+  .include ../../../sqlite.testscript
+
+  $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+  .include ../../../pgsql.testscript
+
+  $create_schema;
+  $*
+}