Switch to build2

5 files changed, 110 insertions, 125 deletions

diff --git a/common/threads/buildfile b/common/threads/buildfile
new file mode 100644
index 0000000..53b98ec
--- /dev/null
+++ b/common/threads/buildfile
@@ -0,0 +1,49 @@
+# file      : common/threads/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 threads_ \
+              --generate-schema       \
+              --generate-query        \
+              --generate-prepared
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
+
+# While we don't call any pthread_*() functions, this appears to be needed for
+# some std::thread implementations (like libstdc++). Note that
+# odb::details::thread inlines some std::thread API calls.
+#
+if ($cxx.target.class != 'windows')
+  cxx.libs += -pthread
+
+# Testscript's run-time prerequisites.
+#
+exe{driver}: ../../alias{database-client}: include = adhoc
diff --git a/common/threads/driver.cxx b/common/threads/driver.cxx
index 3a2d408..1add011 100644
--- a/common/threads/driver.cxx
+++ b/common/threads/driver.cxx
@@ -5,9 +5,8 @@
 //
 
 #include <vector>
-#include <memory>   // std::auto_ptr
+#include <memory>   // std::unique_ptr
 #include <cstddef>  // std::size_t
-#include <cassert>
 #include <iostream>
 
 #include <odb/database.hxx>
@@ -16,16 +15,19 @@
 #include <odb/details/shared-ptr.hxx>
 #include <odb/details/thread.hxx>
 
-#include <common/config.hxx> // DATABASE_*
-#include <common/common.hxx>
+#include <libcommon/config.hxx> // DATABASE_*
+#include <libcommon/common.hxx>
 
-#if defined(DATABASE_SQLITE) || defined(DATABASE_COMMON)
+#if defined(DATABASE_SQLITE)
 #  include <odb/sqlite/database.hxx>
 #endif
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 namespace details = odb::details;
@@ -61,6 +63,7 @@ struct task
           try
           {
             transaction t (db_.begin ());
+
             db_.persist (o1);
             db_.persist (o2);
             db_.persist (o3);
@@ -74,7 +77,7 @@ struct task
         {
           try
           {
-#if !defined(DATABASE_SQLITE) && !defined(DATABASE_COMMON)
+#if !defined(DATABASE_SQLITE)
             transaction t (db_.begin ());
 #else
             // SQLite has a peculiar table locking mode (shared cache)
@@ -93,7 +96,7 @@ struct task
                 static_cast<odb::sqlite::database&> (db_).begin_immediate ());
             }
 #endif
-            auto_ptr<object> o (db_.load<object> (id));
+            unique_ptr<object> o (db_.load<object> (id));
             assert (o->str_ == "first object");
             o->str_ = "another value";
             db_.update (*o);
@@ -178,7 +181,7 @@ struct task
 bool
 test (int argc, char* argv[], size_t max_connections)
 {
-  auto_ptr<database> db (create_database (argc, argv, true, max_connections));
+  unique_ptr<database> db (create_database (argc, argv, true, max_connections));
 
   vector<details::shared_ptr<details::thread> > threads;
   vector<details::shared_ptr<task> > tasks;
diff --git a/common/threads/makefile b/common/threads/makefile
deleted file mode 100644
index 59e6514..0000000
--- a/common/threads/makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# file      : common/threads/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-prepared --table-prefix threads_
-$(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/threads/test.std b/common/threads/test.std
deleted file mode 100644
index e69de29..0000000
--- a/common/threads/test.std
+++ /dev/null
diff --git a/common/threads/testscript b/common/threads/testscript
new file mode 100644
index 0000000..87e03e0
--- /dev/null
+++ b/common/threads/testscript
@@ -0,0 +1,50 @@
+# file      : common/threads/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
+
+  # Note: this is quite slow:
+  #
+  # $ time ./driver --database ~/odb-test.db
+  # real 3m5.593s
+  # user 1m1.244s
+  # sys	 0m26.793s
+  #
+  # $ time ./driver --database /tmp/odb-test.db
+  # real 0m13.909s
+  # user 0m16.724s
+  # sys  0m4.874s
+  #
+  # $ time ./driver --database "file::memory:"
+  # real	0m12.406s
+  # user	0m15.694s
+  # sys	0m4.207s
+  #
+  $*
+}
+
+: pgsql
+:
+if $pgsql
+{
+  .include ../../pgsql.testscript
+
+  $create_schema;
+  $*
+}