Switch to build2

6 files changed, 89 insertions, 165 deletions

diff --git a/common/wrapper/buildfile b/common/wrapper/buildfile
new file mode 100644
index 0000000..57f43f2
--- /dev/null
+++ b/common/wrapper/buildfile
@@ -0,0 +1,40 @@
+# file      : common/wrapper/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 wrapper_ \
+              --generate-schema
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../alias{database-client}: include = adhoc
diff --git a/common/wrapper/driver.cxx b/common/wrapper/driver.cxx
index 255e138..9c352fc 100644
--- a/common/wrapper/driver.cxx
+++ b/common/wrapper/driver.cxx
@@ -4,18 +4,20 @@
 // Test wrapper machinery.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #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;
 
@@ -24,7 +26,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test 1: simple values.
     //
@@ -40,10 +42,8 @@ main (int argc, char* argv[])
         o1.nstrs.push_back (nullable_string ());
         o1.nstrs.push_back (nullable_string ("123"));
 
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
         o2.sstrs.push_back (str_sptr ());
         o2.sstrs.push_back (str_sptr (new string ("123")));
-#endif
 
         transaction t (db->begin ());
         id1 = db->persist (o1);
@@ -53,8 +53,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object1> o1 (db->load<object1> (id1));
-        auto_ptr<object2> o2 (db->load<object2> (id2));
+        unique_ptr<object1> o1 (db->load<object1> (id1));
+        unique_ptr<object2> o2 (db->load<object2> (id2));
         t.commit ();
 
         assert (*o1->num == 123);
@@ -63,11 +63,9 @@ main (int argc, char* argv[])
         assert (o1->nstrs[0].null ());
         assert (o1->nstrs[1].get () == "123");
 
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
         assert (!o2->sstr);
         assert (!o2->sstrs[0]);
         assert (*o2->sstrs[1] == "123");
-#endif
       }
     }
 
@@ -96,7 +94,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<comp_object> o (db->load<comp_object> (id));
+        unique_ptr<comp_object> o (db->load<comp_object> (id));
         t.commit ();
 
         assert (*o->c1 == *co.c1);
@@ -130,7 +128,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<cont_object> o (db->load<cont_object> (id));
+        unique_ptr<cont_object> o (db->load<cont_object> (id));
         t.commit ();
 
         assert (*o->nums == *co.nums);
@@ -164,8 +162,8 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id));
-        auto_ptr<object> p2 (db->load<object> (o2.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id));
+        unique_ptr<object> p2 (db->load<object> (o2.id));
         t.commit ();
 
         assert (p1->p.get () == 0);
@@ -196,8 +194,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> p1 (db->load<object> (o1.id));
-        auto_ptr<object> p2 (db->load<object> (o2.id));
+        unique_ptr<object> p1 (db->load<object> (o1.id));
+        unique_ptr<object> p2 (db->load<object> (o2.id));
         t.commit ();
 
         assert (p1->p.get () != 0 && *p1->p == *o1.p);
diff --git a/common/wrapper/makefile b/common/wrapper/makefile
deleted file mode 100644
index 4393d16..0000000
--- a/common/wrapper/makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# file      : common/wrapper/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 --table-prefix wrapper_
-$(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/wrapper/test.hxx b/common/wrapper/test.hxx
index 27d020b..3ae4151 100644
--- a/common/wrapper/test.hxx
+++ b/common/wrapper/test.hxx
@@ -4,19 +4,13 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-
 #include <string>
-#include <memory> // std::auto_ptr
+#include <memory> // std::unique_ptr
 #include <vector>
 
 #include <odb/core.hxx>
 #include <odb/nullable.hxx>
 
-#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY)
-#  include <odb/tr1/memory.hxx>
-#endif
-
 using odb::nullable;
 
 // Test 1: simple values.
@@ -26,17 +20,9 @@ namespace test1
 {
   typedef nullable<std::string> nullable_string;
 
-#ifdef HAVE_CXX11
   typedef std::unique_ptr<int> num_uptr;
   typedef std::unique_ptr<std::string> str_uptr;
   typedef std::shared_ptr<std::string> str_sptr;
-#else
-  typedef std::auto_ptr<int> num_uptr;
-  typedef std::auto_ptr<std::string> str_uptr;
-#  ifdef HAVE_TR1_MEMORY
-  typedef std::tr1::shared_ptr<std::string> str_sptr;
-#  endif
-#endif
 
   #pragma db object table("obj1")
   struct object1
@@ -59,13 +45,11 @@ namespace test1
     #pragma db id auto
     unsigned long id_;
 
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
     #pragma db null
     str_sptr sstr;
 
     #pragma db value_null
     std::vector<str_sptr> sstrs;
-#endif
   };
 }
 
@@ -110,15 +94,9 @@ operator== (const comp2& x, const comp2& y)
 
 struct comp3;
 
-#ifdef HAVE_CXX11
 typedef std::unique_ptr<comp1> comp1_uptr;
 typedef std::unique_ptr<comp2> comp2_uptr;
 typedef std::unique_ptr<comp3> comp3_uptr;
-#else
-typedef std::auto_ptr<comp1> comp1_uptr;
-typedef std::auto_ptr<comp2> comp2_uptr;
-typedef std::auto_ptr<comp3> comp3_uptr;
-#endif
 
 #pragma db object
 struct comp_object
@@ -153,13 +131,8 @@ struct comp_object2
 // Containers.
 //
 
-#ifdef HAVE_CXX11
 typedef std::unique_ptr<std::vector<int>> nums_uptr;
 typedef std::unique_ptr<std::vector<std::string>> strs_uptr;
-#else
-typedef std::auto_ptr<std::vector<int> > nums_uptr;
-typedef std::auto_ptr<std::vector<std::string> > strs_uptr;
-#endif
 
 #pragma db value
 struct cont_comp
@@ -195,7 +168,7 @@ namespace test5
     base () {}
     base (int n): num (n) {}
 
-    int num;
+    int num = 0;
   };
 
   inline bool
@@ -230,11 +203,7 @@ namespace test5
     unsigned long id;
 
     #pragma db null
-#ifdef HAVE_CXX11
     std::unique_ptr<comp> p;
-#else
-    std::auto_ptr<comp> p;
-#endif
 
     odb::nullable<comp> n;
 
diff --git a/common/wrapper/test.std b/common/wrapper/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/wrapper/test.std
+++ /dev/null
diff --git a/common/wrapper/testscript b/common/wrapper/testscript
new file mode 100644
index 0000000..6630813
--- /dev/null
+++ b/common/wrapper/testscript
@@ -0,0 +1,33 @@
+# file      : common/wrapper/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;
+  $*
+}