Switch to build2

12 files changed, 170 insertions, 256 deletions

diff --git a/common/session/cache/buildfile b/common/session/cache/buildfile
new file mode 100644
index 0000000..6d5b0bc
--- /dev/null
+++ b/common/session/cache/buildfile
@@ -0,0 +1,41 @@
+# file      : common/session/cache/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 session_cache_ \
+              --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/session/cache/driver.cxx b/common/session/cache/driver.cxx
index 6858d06..4b4ea12 100644
--- a/common/session/cache/driver.cxx
+++ b/common/session/cache/driver.cxx
@@ -4,19 +4,21 @@
 // Test session object cache.
 //
 
-#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,11 +27,10 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Test the session_required exception.
     //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
     {
       using namespace test1;
 
@@ -73,7 +74,6 @@ main (int argc, char* argv[])
         t.commit ();
       }
     }
-#endif
   }
   catch (const odb::exception& e)
   {
diff --git a/common/session/cache/makefile b/common/session/cache/makefile
deleted file mode 100644
index 8e475a2..0000000
--- a/common/session/cache/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/session/cache/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 session_cache_
-$(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/session/cache/test.hxx b/common/session/cache/test.hxx
index 3ee2fbf..d2b1b2b 100644
--- a/common/session/cache/test.hxx
+++ b/common/session/cache/test.hxx
@@ -4,31 +4,18 @@
 #ifndef TEST_HXX
 #define TEST_HXX
 
-#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
-
 #include <memory>
 #include <vector>
 
 #include <odb/core.hxx>
 
-#if !defined(HAVE_CXX11) && defined(HAVE_TR1_MEMORY)
-#  include <odb/tr1/memory.hxx>
-#endif
-
 // Test the session_required exception.
 //
-#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
-
 #pragma db namespace table("t1_")
 namespace test1
 {
-#ifdef HAVE_CXX11
   using std::shared_ptr;
   using std::weak_ptr;
-#else
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
-#endif
 
   #pragma db namespace(test1) pointer(shared_ptr)
 
@@ -60,6 +47,4 @@ namespace test1
   };
 }
 
-#endif // HAVE_CXX11 || HAVE_TR1_MEMORY
-
 #endif // TEST_HXX
diff --git a/common/session/cache/test.std b/common/session/cache/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/session/cache/test.std
+++ /dev/null
diff --git a/common/session/cache/testscript b/common/session/cache/testscript
new file mode 100644
index 0000000..6d013eb
--- /dev/null
+++ b/common/session/cache/testscript
@@ -0,0 +1,33 @@
+# file      : common/session/cache/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;
+  $*
+}
diff --git a/common/session/custom/buildfile b/common/session/custom/buildfile
new file mode 100644
index 0000000..1b64de1
--- /dev/null
+++ b/common/session/custom/buildfile
@@ -0,0 +1,43 @@
+# file      : common/session/custom/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 txx 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 session_custom_          \
+              --generate-schema                       \
+              --generate-session                      \
+              --session-type ::session                \
+              --hxx-prologue '#include "session.hxx"'
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../../alias{database-client}: include = adhoc
diff --git a/common/session/custom/driver.cxx b/common/session/custom/driver.cxx
index 851443e..3056fd6 100644
--- a/common/session/custom/driver.cxx
+++ b/common/session/custom/driver.cxx
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <cstddef> // std::size_t
-#include <cassert>
 #include <iostream>
 
 #include <odb/tracer.hxx>
@@ -15,13 +14,16 @@
 #include <odb/transaction.hxx>
 #include <odb/details/config.hxx> // ODB_CXX11_*
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "session.hxx"
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 
 using odb::database;
@@ -43,7 +45,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // Simple Tech Ltd.
     //
diff --git a/common/session/custom/makefile b/common/session/custom/makefile
deleted file mode 100644
index c1fa5bc..0000000
--- a/common/session/custom/makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# file      : common/session/custom/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-cxx_tun := driver.cxx session.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 \
---session-type ::session --hxx-prologue '\#include "session.hxx"' \
---table-prefix session_custom_
-$(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): export extra_headers := session.hxx session.txx
-$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun))
-$(dist): data_dist := test.std
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(data_dist) $(call vc10projs,$(name)) \
-$(call vc11projs,$(name)) $(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist))
-	$(call meta-automake,../../template/Makefile.am)
-	$(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/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/session/custom/session.hxx b/common/session/custom/session.hxx
index 29ac040..2d2f597 100644
--- a/common/session/custom/session.hxx
+++ b/common/session/custom/session.hxx
@@ -106,6 +106,15 @@ public:
     cache_position (): map_ (0) {}
     cache_position (map& m, const iterator& p): map_ (&m), pos_ (p) {}
 
+    cache_position (const cache_position& p)
+        : map_ (p.map_)
+    {
+      // It might not be ok to use an uninitialized iterator.
+      //
+      if (p.map_ != 0)
+        pos_ = p.pos_;
+    }
+
     cache_position&
     operator= (const cache_position& p)
     {
diff --git a/common/session/custom/test.std b/common/session/custom/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/session/custom/test.std
+++ /dev/null
diff --git a/common/session/custom/testscript b/common/session/custom/testscript
new file mode 100644
index 0000000..39c281d
--- /dev/null
+++ b/common/session/custom/testscript
@@ -0,0 +1,33 @@
+# file      : common/session/custom/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;
+  $*
+}