Switch to build2

6 files changed, 92 insertions, 178 deletions

diff --git a/common/lazy-ptr/buildfile b/common/lazy-ptr/buildfile
new file mode 100644
index 0000000..d495d2f
--- /dev/null
+++ b/common/lazy-ptr/buildfile
@@ -0,0 +1,41 @@
+# file      : common/lazy-ptr/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 lazy_ptr_ \
+              --generate-schema        \
+              --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/lazy-ptr/driver.cxx b/common/lazy-ptr/driver.cxx
index 9458772..9a3b324 100644
--- a/common/lazy-ptr/driver.cxx
+++ b/common/lazy-ptr/driver.cxx
@@ -4,26 +4,32 @@
 // Test lazy object pointers.
 //
 
-#include <memory>   // std::auto_ptr
+#include <memory>   // std::unique_ptr
 #include <utility>  // std::move
-#include <cassert>
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/session.hxx>
 #include <odb/transaction.hxx>
-#include <odb/details/config.hxx> // ODB_CXX11_*
 
-#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;
 
 namespace test2
 {
+  cont::cont (unsigned long i)
+      : id (i)
+  {
+  }
+
   obj_ptr
   create (unsigned int id)
   {
@@ -44,7 +50,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Raw.
     //
@@ -61,8 +67,8 @@ main (int argc, char* argv[])
         t.commit ();
       }
 
-      auto_ptr<cont> c1 (new cont (1));
-      auto_ptr<cont> c2 (new cont (2));
+      unique_ptr<cont> c1 (new cont (1));
+      unique_ptr<cont> c2 (new cont (2));
 
       lazy_ptr<obj> lo1 (*db, 1);
       obj* o2 (new obj (2));
@@ -104,7 +110,7 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-        auto_ptr<cont> c (db->load<cont> (1));
+        unique_ptr<cont> c (db->load<cont> (1));
         obj* o (db->load<obj> (1));
 
         // Not loaded.
@@ -117,13 +123,8 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o[0].object_id () == o->id);
         assert (o->c.object_id () == c->id);
-#else
-        assert (c->o[0].object_id<obj> () == o->id);
-        assert (o->c.object_id<cont> () == c->id);
-#endif
 
         // Load.
         //
@@ -144,7 +145,7 @@ main (int argc, char* argv[])
       }
     }
 
-    // std::auto_ptr/std::unique_ptr
+    // std::unique_ptr
     //
     {
       using namespace test2;
@@ -164,11 +165,7 @@ main (int argc, char* argv[])
       lazy_obj_ptr lo1 = create (*db, 1);
       lo1 = create (*db, 1);
 
-#ifdef HAVE_CXX11
       c1->o = std::move (lo1);
-#else
-      c1->o = lo1;
-#endif
       c2->o = create (2);
 
       {
@@ -197,13 +194,8 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o.object_id () == o->id);
         assert (o->c.object_id () == c->id);
-#else
-        assert (c->o.object_id<obj> () == o->id);
-        assert (o->c.object_id<cont> () == c->id);
-#endif
 
         // Load.
         //
@@ -237,7 +229,6 @@ main (int argc, char* argv[])
 
     // Shared pointer from C++11 or TR1.
     //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
     {
       using namespace test3;
 
@@ -276,7 +267,6 @@ main (int argc, char* argv[])
 
       // Test move constructors.
       //
-#ifdef HAVE_CXX11
       {
         lazy_shared_ptr<cont> tmp (*db, 1);
         lazy_shared_ptr<cont> l (std::move (tmp));
@@ -288,7 +278,6 @@ main (int argc, char* argv[])
         lazy_shared_ptr<cont> l (*db, std::move (tmp));
         assert (lc1 == l);
       }
-#endif
 
       {
         transaction t (db->begin ());
@@ -321,13 +310,8 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o[0].object_id () == o->id);
         assert (o->c.object_id () == c->id);
-#else
-        assert (c->o[0].object_id<obj> () == o->id);
-        assert (o->c.object_id<cont> () == c->id);
-#endif
 
         // Load.
         //
@@ -352,12 +336,7 @@ main (int argc, char* argv[])
         assert (!c->o[1].loaded ());
         lazy_shared_ptr<obj> l (c->o[1].lock ());
         assert (!l.loaded ());
-
-#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (l.object_id () == c->o[1].object_id ());
-#else
-        assert (l.object_id<obj> () == c->o[1].object_id<obj> ());
-#endif
 
         // Reload.
         //
@@ -372,7 +351,6 @@ main (int argc, char* argv[])
         t.commit ();
       }
     }
-#endif
   }
   catch (const odb::exception& e)
   {
diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile
deleted file mode 100644
index 62880fa..0000000
--- a/common/lazy-ptr/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/lazy-ptr/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-session \
---table-prefix lazy_ptr_
-$(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/lazy-ptr/test.hxx b/common/lazy-ptr/test.hxx
index da1f2c4..f946029 100644
--- a/common/lazy-ptr/test.hxx
+++ b/common/lazy-ptr/test.hxx
@@ -4,8 +4,6 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-
 #include <vector>
 #include <string>
 #include <memory>
@@ -13,11 +11,6 @@
 #include <odb/core.hxx>
 #include <odb/lazy-ptr.hxx>
 
-#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY)
-#  include <odb/tr1/memory.hxx>
-#  include <odb/tr1/lazy-ptr.hxx>
-#endif
-
 // Raw pointer.
 //
 #pragma db namespace table("t1_")
@@ -76,22 +69,16 @@ namespace test2
   class obj;
   class cont;
 
-#ifdef HAVE_CXX11
   typedef std::unique_ptr<obj> obj_ptr;
   typedef std::unique_ptr<cont> cont_ptr;
   typedef odb::lazy_unique_ptr<obj> lazy_obj_ptr;
-#else
-  typedef std::auto_ptr<obj> obj_ptr;
-  typedef std::auto_ptr<cont> cont_ptr;
-  typedef odb::lazy_auto_ptr<obj> lazy_obj_ptr;
-#endif
 
   #pragma db object
   class cont
   {
   public:
-    cont () {}
-    cont (unsigned long i): id (i) {}
+    cont () = default;
+    cont (unsigned long id);
 
     #pragma db id
     unsigned long id;
@@ -104,7 +91,7 @@ namespace test2
   class obj
   {
   public:
-    obj () {}
+    obj () = default;
     obj (unsigned long i): id (i) {}
 
     #pragma db id
@@ -117,19 +104,12 @@ namespace test2
 
 // shared_ptr
 //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
 #pragma db namespace table("t3_")
 namespace test3
 {
-#ifdef HAVE_CXX11
   using std::shared_ptr;
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
-#else
-  using std::tr1::shared_ptr;
-  using odb::tr1::lazy_shared_ptr;
-  using odb::tr1::lazy_weak_ptr;
-#endif
 
   class obj;
 
@@ -163,6 +143,5 @@ namespace test3
     lazy_shared_ptr<cont> c;
   };
 }
-#endif
 
 #endif // TEST_HXX
diff --git a/common/lazy-ptr/test.std b/common/lazy-ptr/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/lazy-ptr/test.std
+++ /dev/null
diff --git a/common/lazy-ptr/testscript b/common/lazy-ptr/testscript
new file mode 100644
index 0000000..736fa4c
--- /dev/null
+++ b/common/lazy-ptr/testscript
@@ -0,0 +1,33 @@
+# file      : common/lazy-ptr/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;
+  $*
+}