Switch to build2

6 files changed, 53 insertions, 119 deletions

diff --git a/sqlite/types/buildfile b/sqlite/types/buildfile
new file mode 100644
index 0000000..1bf719d
--- /dev/null
+++ b/sqlite/types/buildfile
@@ -0,0 +1,32 @@
+# file      : sqlite/types/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
+"sqlite should be configured via config.odb_tests.database variable as a single database"
+
+import libodb = libodb%lib{odb}
+
+import libs  = libodb-sqlite%lib{odb-sqlite}
+import libs += lib{common}
+
+exe{driver}: {hxx cxx}{* -*-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}
+
+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 sqlitex_types_          \
+              --generate-schema                      \
+              --default-database common              \
+              --generate-query                       \
+              --cxx-prologue '#include "traits.hxx"'
+
+cxx.poptions =+ "-I$out_base" "-I$src_base"
diff --git a/sqlite/types/driver.cxx b/sqlite/types/driver.cxx
index 8f25330..b444d94 100644
--- a/sqlite/types/driver.cxx
+++ b/sqlite/types/driver.cxx
@@ -5,18 +5,20 @@
 //
 
 #include <limits>   // std::numeric_limits
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/sqlite/database.hxx>
 #include <odb/sqlite/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 namespace sqlite = odb::sqlite;
 using namespace sqlite;
@@ -26,7 +28,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_specific_database<database> (argc, argv));
+    unique_ptr<database> db (create_specific_database<database> (argc, argv));
 
     object o (1);
 
@@ -51,7 +53,7 @@ main (int argc, char* argv[])
 
     {
       transaction t (db->begin ());
-      auto_ptr<object> o1 (db->load<object> (1));
+      unique_ptr<object> o1 (db->load<object> (1));
       t.commit ();
 
       assert (o == *o1);
@@ -92,9 +94,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<char_array> p1 (db->load<char_array> (1));
-        auto_ptr<char_array> p2 (db->load<char_array> (2));
-        auto_ptr<char_array> p3 (db->load<char_array> (3));
+        unique_ptr<char_array> p1 (db->load<char_array> (1));
+        unique_ptr<char_array> p2 (db->load<char_array> (2));
+        unique_ptr<char_array> p3 (db->load<char_array> (3));
         t.commit ();
 
         assert (o1 == *p1);
diff --git a/sqlite/types/makefile b/sqlite/types/makefile
deleted file mode 100644
index f3810b2..0000000
--- a/sqlite/types/makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-# file      : sqlite/types/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 += --database sqlite --default-database \
-common --generate-schema --generate-query --cxx-prologue \
-'\#include "traits.hxx"' --table-prefix sqlitex_types_
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := traits.hxx
-$(dist): data_dist := test.std
-$(dist): export name := $(subst /,-,$(subst $(src_root)/sqlite/,,$(src_base)))
-$(dist): export extra_dist := $(data_dist) \
-$(name)-vc8.vcproj $(name)-vc9.vcproj \
-$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \
-$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \
-$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj)
-	$(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
-	$(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
-	$(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj)
-	$(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj)
-
-# Test.
-#
-$(eval $(call test-schemaless-rule))
-
-# 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/sqlite/types/test.hxx b/sqlite/types/test.hxx
index f642738..fe0b274 100644
--- a/sqlite/types/test.hxx
+++ b/sqlite/types/test.hxx
@@ -7,7 +7,7 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <memory>  // std::auto_ptr
+#include <memory>  // std::unique_ptr
 #include <cstring> // std::memcpy, std::str[n]cmp, std::strlen
 
 #ifdef _WIN32
@@ -16,7 +16,7 @@
 
 #include <odb/core.hxx>
 
-typedef std::auto_ptr<std::string> string_ptr;
+typedef std::unique_ptr<std::string> string_ptr;
 
 #pragma db object
 struct object
diff --git a/sqlite/types/test.std b/sqlite/types/test.std
deleted file mode 100644
index e69de29..0000000
--- a/sqlite/types/test.std
+++ /dev/null
diff --git a/sqlite/types/testscript b/sqlite/types/testscript
new file mode 100644
index 0000000..5e50d32
--- /dev/null
+++ b/sqlite/types/testscript
@@ -0,0 +1,9 @@
+# file      : sqlite/types/testscript
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+.include ../../database-options.testscript
+.include ../../sqlite.testscript
+
+: basics
+:
+$*