Switch to build2

6 files changed, 89 insertions, 145 deletions

diff --git a/common/inverse/buildfile b/common/inverse/buildfile
new file mode 100644
index 0000000..63fa1cb
--- /dev/null
+++ b/common/inverse/buildfile
@@ -0,0 +1,42 @@
+# file      : common/inverse/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_inverse_ \
+              --generate-schema         \
+              --generate-query          \
+              --generate-session
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../alias{database-client}: include = adhoc
diff --git a/common/inverse/driver.cxx b/common/inverse/driver.cxx
index 07c584d..842438e 100644
--- a/common/inverse/driver.cxx
+++ b/common/inverse/driver.cxx
@@ -4,19 +4,21 @@
 // Test bidirectional relationships with inverse sides.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/session.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;
 
@@ -25,7 +27,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test raw pointers.
     //
@@ -211,7 +213,6 @@ main (int argc, char* argv[])
 
     // Test shared_ptr/weak_ptr.
     //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
     {
       using namespace test2;
 
@@ -323,7 +324,6 @@ main (int argc, char* argv[])
         }
       }
     }
-#endif
 
     // Test inverse based on points_to.
     //
@@ -346,7 +346,7 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
 
-          auto_ptr<obj1> p (db->load<obj1> (o1.id));
+          unique_ptr<obj1> p (db->load<obj1> (o1.id));
           assert (p->o2->id == o1.o2->id);
 
           t.commit ();
@@ -357,7 +357,7 @@ main (int argc, char* argv[])
 
           transaction t (db->begin ());
 
-          auto_ptr<obj1> p (db->query_one<obj1> (query::o2->o1.i == o1.id.i &&
+          unique_ptr<obj1> p (db->query_one<obj1> (query::o2->o1.i == o1.id.i &&
                                                  query::o2->o1.j == o1.id.j));
           assert (p->o2->id == o1.o2->id);
 
@@ -383,7 +383,7 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
 
-          auto_ptr<obj3> p (db->load<obj3> (o3.id));
+          unique_ptr<obj3> p (db->load<obj3> (o3.id));
           assert (p->o4[0]->id == o3.o4[0]->id);
           assert (p->o4[1]->id == o3.o4[1]->id);
 
@@ -395,7 +395,7 @@ main (int argc, char* argv[])
 
           transaction t (db->begin ());
 
-          auto_ptr<obj3> p (db->query_one<obj3> (query::id == o3.id));
+          unique_ptr<obj3> p (db->query_one<obj3> (query::id == o3.id));
           assert (p->o4[0]->id == o3.o4[0]->id);
           assert (p->o4[1]->id == o3.o4[1]->id);
 
@@ -426,7 +426,7 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
 
-          auto_ptr<obj1> p (db->load<obj1> (o1.id));
+          unique_ptr<obj1> p (db->load<obj1> (o1.id));
           assert (p->o2->id.i == o1.o2->id.i && p->o2->id.j == o1.o2->id.j);
 
           t.commit ();
@@ -437,7 +437,7 @@ main (int argc, char* argv[])
 
           transaction t (db->begin ());
 
-          auto_ptr<obj1> p (db->query_one<obj1> (
+          unique_ptr<obj1> p (db->query_one<obj1> (
                               query::o2->id.i == o1.o2->id.i &&
                               query::o2->id.j == o1.o2->id.j));
           assert (p->o2->id.i == o1.o2->id.i && p->o2->id.j == o1.o2->id.j);
@@ -466,7 +466,7 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
 
-          auto_ptr<obj3> p (db->load<obj3> (o3.id));
+          unique_ptr<obj3> p (db->load<obj3> (o3.id));
           assert (p->o4[0]->id.i == o3.o4[0]->id.i &&
                   p->o4[0]->id.j == o3.o4[0]->id.j);
 
@@ -481,7 +481,7 @@ main (int argc, char* argv[])
 
           transaction t (db->begin ());
 
-          auto_ptr<obj3> p (db->query_one<obj3> (query::id == o3.id));
+          unique_ptr<obj3> p (db->query_one<obj3> (query::id == o3.id));
 
           assert (p->o4[0]->id.i == o3.o4[0]->id.i &&
                   p->o4[0]->id.j == o3.o4[0]->id.j);
diff --git a/common/inverse/makefile b/common/inverse/makefile
deleted file mode 100644
index 59d86c1..0000000
--- a/common/inverse/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/inverse/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 \
---generate-session --table-prefix t_inverse_
-$(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/inverse/test.hxx b/common/inverse/test.hxx
index 35fd813..a7b8678 100644
--- a/common/inverse/test.hxx
+++ b/common/inverse/test.hxx
@@ -4,8 +4,6 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-
 #include <set>
 #include <vector>
 #include <string>
@@ -13,10 +11,6 @@
 
 #include <odb/core.hxx>
 
-#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY)
-#  include <odb/tr1/memory.hxx>
-#endif
-
 // Test raw pointers.
 //
 #pragma db namespace table("t1_")
@@ -127,18 +121,11 @@ namespace test1
 
 // Test shared_ptr/weak_ptr.
 //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
-
 #pragma db namespace table("t2_")
 namespace test2
 {
-#ifdef HAVE_CXX11
   using std::shared_ptr;
   using std::weak_ptr;
-#else
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
-#endif
 
   struct obj1;
   struct obj2;
@@ -229,7 +216,6 @@ namespace test2
     obj1_wptr_vec o1;
   };
 }
-#endif
 
 // Test inverse based on points_to.
 //
diff --git a/common/inverse/test.std b/common/inverse/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/inverse/test.std
+++ /dev/null
diff --git a/common/inverse/testscript b/common/inverse/testscript
new file mode 100644
index 0000000..c2a4e3e
--- /dev/null
+++ b/common/inverse/testscript
@@ -0,0 +1,33 @@
+# file      : common/inverse/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;
+  $*
+}