Switch to build2

6 files changed, 83 insertions, 157 deletions

diff --git a/common/container/change-tracking/buildfile b/common/container/change-tracking/buildfile
new file mode 100644
index 0000000..1dda818
--- /dev/null
+++ b/common/container/change-tracking/buildfile
@@ -0,0 +1,40 @@
+# file      : common/container/change-tracking/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_cont_changet_ \
+              --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/container/change-tracking/driver.cxx b/common/container/change-tracking/driver.cxx
index f7407bd..4894ed9 100644
--- a/common/container/change-tracking/driver.cxx
+++ b/common/container/change-tracking/driver.cxx
@@ -4,26 +4,23 @@
 // Test change-tracking containers.
 //
 
-#include <common/config.hxx> // HAVE_CXX11
-
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
+#include <utility>  // std::move
 #include <iostream>
 
-#ifdef HAVE_CXX11
-#  include <utility> // std::move
-#endif
-
 #include <odb/tracer.hxx>
 #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;
 
@@ -58,8 +55,7 @@ static counting_tracer tr;
 //
 
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
-#if !defined (HAVE_CXX11) || \
-  (defined (__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if defined (__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
 struct item {};
 template class odb::vector<item>;
 template class odb::vector_iterator<odb::vector<item>,
@@ -111,7 +107,7 @@ main (int argc, char* argv[])
 #endif
     }
 
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test traits logic.
     //
@@ -136,11 +132,7 @@ main (int argc, char* argv[])
       //
       {
         transaction t (db->begin ());
-#ifdef HAVE_CXX11
         unique_ptr<object> p (db->load<object> ("1"));
-#else
-        auto_ptr<object> p (db->load<object> ("1"));
-#endif
         assert (p->s._tracking ());
         t.commit ();
       }
@@ -554,11 +546,7 @@ main (int argc, char* argv[])
     // Armed copy.
     //
     {
-#ifdef HAVE_CXX11
       unique_ptr<object> c;
-#else
-      auto_ptr<object> c;
-#endif
 
       {
         o.s.pop_back ();
@@ -621,7 +609,6 @@ main (int argc, char* argv[])
 
     // Armed move.
     //
-#ifdef HAVE_CXX11
     {
       unique_ptr<object> c;
 
@@ -652,7 +639,6 @@ main (int argc, char* argv[])
         t.commit ();
       }
     }
-#endif
 
     // Test mixing "smart" and "dumb" container (specifically, erase(obj)).
     //
@@ -699,13 +685,8 @@ main (int argc, char* argv[])
       {
         session s;
         transaction t (db->begin ());
-#ifdef HAVE_CXX11
         unique_ptr<inv_object1> p1 (db->load<inv_object1> (o1.id_));
         unique_ptr<inv_object2> p2 (db->load<inv_object2> (o2.id_));
-#else
-        auto_ptr<inv_object1> p1 (db->load<inv_object1> (o1.id_));
-        auto_ptr<inv_object2> p2 (db->load<inv_object2> (o2.id_));
-#endif
         assert (p2->o1[0] == p1.get ());
         assert (!p2->o1._tracking ());
         t.commit ();
diff --git a/common/container/change-tracking/makefile b/common/container/change-tracking/makefile
deleted file mode 100644
index 53fd314..0000000
--- a/common/container/change-tracking/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/container/change-tracking/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 t_cont_changet_
-$(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/container/change-tracking/test.hxx b/common/container/change-tracking/test.hxx
index be78244..8e06f4a 100644
--- a/common/container/change-tracking/test.hxx
+++ b/common/container/change-tracking/test.hxx
@@ -4,33 +4,22 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11
-
 #include <string>
 #include <memory>
 #include <vector>
-
-#ifdef HAVE_CXX11
-#  include <utility> // std::move
-#endif
+#include <utility> // std::move
 
 #include <odb/core.hxx>
 #include <odb/vector.hxx>
 
-#ifdef HAVE_CXX11
 #pragma db object pointer(std::unique_ptr)
-#else
-#pragma db object pointer(std::auto_ptr)
-#endif
 struct object
 {
   object () {}
   object (const std::string& id): id_ (id) {}
 
-#ifdef HAVE_CXX11
   object (const object& x): id_ (x.id_), i (x.i), s (x.s) {}
   object (object&& x): id_ (std::move (x.id_)), i (x.i), s (std::move (x.s)) {}
-#endif
 
   #pragma db id
   std::string id_;
@@ -40,7 +29,7 @@ struct object
   odb::vector<std::string> s;
 
   inline bool
-  operator== (const object& o) {return id_ == o.id_ && i == o.i && s == o.s;}
+  operator== (const object& o) const {return id_ == o.id_ && i == o.i && s == o.s;}
 };
 
 // Test mixing "smart" and "dumb" container (specifically, erase(obj)).
diff --git a/common/container/change-tracking/test.std b/common/container/change-tracking/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/container/change-tracking/test.std
+++ /dev/null
diff --git a/common/container/change-tracking/testscript b/common/container/change-tracking/testscript
new file mode 100644
index 0000000..2169869
--- /dev/null
+++ b/common/container/change-tracking/testscript
@@ -0,0 +1,33 @@
+# file      : common/container/change-tracking/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;
+  $*
+}