diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | build/bootstrap.build | 18 | ||||
| -rw-r--r-- | build/export.build | 10 | ||||
| -rw-r--r-- | build/root.build | 14 | ||||
| -rw-r--r-- | buildfile | 9 | ||||
| -rw-r--r-- | odb/sqlite/buildfile | 107 | ||||
| -rw-r--r-- | odb/sqlite/details/build2/config-vc.h | 16 | ||||
| -rw-r--r-- | odb/sqlite/details/build2/config.h | 18 | ||||
| -rw-r--r-- | odb/sqlite/details/config.hxx | 2 | ||||
| -rw-r--r-- | odb/sqlite/details/export.hxx | 39 | ||||
| -rw-r--r-- | tests/basics/buildfile | 8 | ||||
| -rw-r--r-- | tests/basics/driver.cxx | 46 | ||||
| -rw-r--r-- | tests/build/bootstrap.build | 9 | ||||
| -rw-r--r-- | tests/build/root.build | 14 | ||||
| -rw-r--r-- | tests/buildfile | 7 |
15 files changed, 321 insertions, 2 deletions
@@ -1,9 +1,13 @@ # Compiler/linker output. # +*.d *.o -*.o.d +*.obj *.so +*.dll *.a +*.lib + *.l *.l.cpp-options diff --git a/build/bootstrap.build b/build/bootstrap.build new file mode 100644 index 0000000..1d3ca56 --- /dev/null +++ b/build/bootstrap.build @@ -0,0 +1,18 @@ +# file : build/bootstrap.build +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +project = libodb-sqlite +version = 2.5.0-a8 +revision = 0 + +using build@0.4.0-a1 +using config +using dist +using test +using install + +dist.package = $project-$version + +if ($revision != 0) + dist.package += +$revision diff --git a/build/export.build b/build/export.build new file mode 100644 index 0000000..18bb2b2 --- /dev/null +++ b/build/export.build @@ -0,0 +1,10 @@ +# file : build/export.build +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$out_root/: +{ + include odb/sqlite/ +} + +export $out_root/odb/sqlite/lib{odb-sqlite} diff --git a/build/root.build b/build/root.build new file mode 100644 index 0000000..44b2195 --- /dev/null +++ b/build/root.build @@ -0,0 +1,14 @@ +# file : build/root.build +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +using cxx + +hxx{*}: extension = hxx +ixx{*}: extension = ixx +txx{*}: extension = txx +cxx{*}: extension = cxx + +cxx.std = 11 + +tests/: install = false # Don't install tests. diff --git a/buildfile b/buildfile new file mode 100644 index 0000000..016dd6f --- /dev/null +++ b/buildfile @@ -0,0 +1,9 @@ +# file : buildfile +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +d = odb/sqlite/ tests/ +./: $d doc{GPLv2 INSTALL LICENSE NEWS README version} file{manifest} +include $d + +doc{INSTALL}@./: install = false diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile new file mode 100644 index 0000000..ff42128 --- /dev/null +++ b/odb/sqlite/buildfile @@ -0,0 +1,107 @@ +# file : odb/buildfile +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +import libs = libsqlite3%lib{sqlite3} +import libs += libodb%lib{odb} + +lib{odb-sqlite}: \ + {hxx }{ auto-handle } \ + {hxx }{ binding } \ + {hxx }{ blob } \ + {hxx cxx}{ blob-stream } \ + {hxx ixx cxx}{ connection } \ + {hxx cxx}{ connection-factory } \ + {hxx txx }{ container-statements } \ + {hxx ixx cxx}{ database } \ + {hxx cxx}{ error } \ + {hxx cxx}{ exceptions } \ + {hxx }{ forward } \ + {hxx txx }{ no-id-object-result } \ + {hxx txx }{ no-id-object-statements } \ + {hxx txx }{ polymorphic-object-result } \ + {hxx txx }{ polymorphic-object-statements } \ + {hxx cxx}{ prepared-query } \ + {hxx ixx txx cxx}{ query } \ + { cxx}{ query-const-expr } \ + {hxx ixx txx cxx}{ query-dynamic } \ + {hxx txx }{ section-statements } \ + {hxx txx }{ simple-object-result } \ + {hxx ixx txx cxx}{ simple-object-statements } \ + {hxx }{ sqlite-types } \ + {hxx txx cxx}{ statement-cache } \ + {hxx cxx}{ statement } \ + {hxx cxx}{ statements-base } \ + {hxx cxx}{ stream } \ + {hxx }{ text } \ + {hxx cxx}{ text-stream } \ + {hxx cxx}{ tracer } \ + {hxx cxx}{ traits } \ + {hxx }{ traits-calls } \ + {hxx ixx cxx}{ transaction } \ + {hxx ixx cxx}{ transaction-impl } \ + {hxx }{ version } \ + {hxx txx }{ view-result } \ + {hxx txx }{ view-statements } \ + details/{hxx }{ config } \ + details/{hxx }{ conversion } \ + details/{hxx }{ export } \ + details/{hxx ixx cxx}{ options } \ +details/build2/{h }{ config } \ +details/build2/{h }{ config-vc } \ + $libs + +cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_SQLITE_BUILD2 +obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBODB_SQLITE_SHARED_BUILD + +lib{odb-sqlite}: cxx.export.poptions = -I$src_root -DLIBODB_SQLITE_BUILD2 +liba{odb-sqlite}: cxx.export.poptions += -DLIBODB_SQLITE_STATIC +libs{odb-sqlite}: cxx.export.poptions += -DLIBODB_SQLITE_SHARED + +# Load the cli module but only if it's available. This way a distribution that +# includes pre-generated files can be built without installing cli. +# +using? cli + +if! $cli.loaded +{ + define cli: file + cli{*}: extension = cli +} + +details/: +{ + {hxx ixx cxx}{options}: cli{options} + + cli.options += --include-with-brackets --include-prefix odb/sqlite/details \ +--guard-prefix LIBODB_SQLITE_DETAILS --generate-file-scanner \ +--cli-namespace odb::sqlite::details::cli --long-usage + + # Include generated cli files into the distribution. But don't install them + # since they are only used internally in the database implementation. + # + {hxx ixx cxx}{options}: dist = true + {hxx ixx}{options}: install = false +} + +# Install into the odb/sqlite/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/odb/sqlite/ +install.include.subdirs = true # Recreate subdirectories. + +# We want these to be picked up even when LIBODB_SQLITE_BUILD2 is not defined. +# +details/build2/: +{ + if ($cxx.id == "msvc") + { + h{config}@./: install = false + h{config-vc}@./: install = $install.include/details + } + else + { + h{config}@./: install = $install.include/details + h{config-vc}@./: install = false + } +} diff --git a/odb/sqlite/details/build2/config-vc.h b/odb/sqlite/details/build2/config-vc.h new file mode 100644 index 0000000..0fd79ee --- /dev/null +++ b/odb/sqlite/details/build2/config-vc.h @@ -0,0 +1,16 @@ +/* file : odb/details/build2/config-vc.h + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef ODB_SQLITE_DETAILS_CONFIG_VC_H +#define ODB_SQLITE_DETAILS_CONFIG_VC_H + +/* Define LIBODB_SQLITE_BUILD2 for the installed case. */ +#ifndef LIBODB_SQLITE_BUILD2 +# define LIBODB_SQLITE_BUILD2 +#endif + +#endif /* ODB_SQLITE_DETAILS_CONFIG_VC_H */ diff --git a/odb/sqlite/details/build2/config.h b/odb/sqlite/details/build2/config.h new file mode 100644 index 0000000..2aa7d54 --- /dev/null +++ b/odb/sqlite/details/build2/config.h @@ -0,0 +1,18 @@ +/* file : odb/sqlite/details/build2/config.h + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. The installed case + (when LIBODB_SQLITE_BUILD2 is not necessarily defined) is the only + reason we have it. */ + +#ifndef ODB_SQLITE_DETAILS_CONFIG_H +#define ODB_SQLITE_DETAILS_CONFIG_H + +/* Define LIBODB_SQLITE_BUILD2 for the installed case. */ +#ifndef LIBODB_SQLITE_BUILD2 +# define LIBODB_SQLITE_BUILD2 +#endif + +#endif /* ODB_SQLITE_DETAILS_CONFIG_H */ diff --git a/odb/sqlite/details/config.hxx b/odb/sqlite/details/config.hxx index ec89ed6..1f31178 100644 --- a/odb/sqlite/details/config.hxx +++ b/odb/sqlite/details/config.hxx @@ -10,7 +10,7 @@ #ifdef ODB_COMPILER # error libodb-sqlite header included in odb-compiled header #elif !defined(LIBODB_SQLITE_BUILD2) -# elif defined(_MSC_VER) +# ifdef _MSC_VER # include <odb/details/config-vc.h> # else # include <odb/details/config.h> diff --git a/odb/sqlite/details/export.hxx b/odb/sqlite/details/export.hxx index 30e9f8b..11a5f0a 100644 --- a/odb/sqlite/details/export.hxx +++ b/odb/sqlite/details/export.hxx @@ -9,6 +9,43 @@ #include <odb/sqlite/details/config.hxx> +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#ifdef LIBODB_SQLITE_BUILD2 + +#if defined(LIBODB_SQLITE_STATIC) // Using static. +# define LIBODB_SQLITE_EXPORT +#elif defined(LIBODB_SQLITE_STATIC_BUILD) // Building static. +# define LIBODB_SQLITE_EXPORT +#elif defined(LIBODB_SQLITE_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBODB_SQLITE_EXPORT __declspec(dllimport) +# else +# define LIBODB_SQLITE_EXPORT +# endif +#elif defined(LIBODB_SQLITE_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBODB_SQLITE_EXPORT __declspec(dllexport) +# else +# define LIBODB_SQLITE_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBODB_SQLITE_EXPORT // Using static or shared. +#endif + +#else // LIBODB_SQLITE_BUILD2 + #ifdef LIBODB_SQLITE_STATIC_LIB # define LIBODB_SQLITE_EXPORT #else @@ -35,6 +72,8 @@ # endif #endif +#endif // LIBODB_SQLITE_BUILD2 + #include <odb/post.hxx> #endif // ODB_SQLITE_DETAILS_EXPORT_HXX diff --git a/tests/basics/buildfile b/tests/basics/buildfile new file mode 100644 index 0000000..833a7c8 --- /dev/null +++ b/tests/basics/buildfile @@ -0,0 +1,8 @@ +# file : tests/basics/buildfile +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +import libs = libodb%lib{odb} # @@ +import libs += libodb-sqlite%lib{odb-sqlite} + +exe{driver}: cxx{driver} $libs diff --git a/tests/basics/driver.cxx b/tests/basics/driver.cxx new file mode 100644 index 0000000..bcdd210 --- /dev/null +++ b/tests/basics/driver.cxx @@ -0,0 +1,46 @@ +// file : tests/basics/driver.cxx +// copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Basic test to make sure the library is usable. Functionality testing +// is done in the odb-tests package. + +#include <cassert> + +#include <odb/sqlite/database.hxx> +#include <odb/sqlite/exceptions.hxx> +#include <odb/sqlite/transaction.hxx> + +using namespace odb::sqlite; + +int +main () +{ + database db (":memory:"); + + { + transaction t (db.begin ()); + db.execute ("CREATE TABLE test (id INTEGER PRIMARY KEY, str TEXT)"); + t.commit (); + } + + { + transaction t (db.begin ()); + db.execute ("INSERT INTO test VALUES (123, 'abc')"); + t.commit (); + } + + try + { + transaction t (db.begin ()); + db.execute ("INSERT INTO test VALUES (123, 'ABC')"); + assert (false); + } + catch (const database_exception&) {} + + { + transaction t (db.begin ()); + db.execute ("DROP TABLE test"); + t.commit (); + } +} diff --git a/tests/build/bootstrap.build b/tests/build/bootstrap.build new file mode 100644 index 0000000..2f8aad2 --- /dev/null +++ b/tests/build/bootstrap.build @@ -0,0 +1,9 @@ +# file : tests/build/bootstrap.build +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +project = # Unnamed subproject. + +using config +using dist +using test diff --git a/tests/build/root.build b/tests/build/root.build new file mode 100644 index 0000000..c731d60 --- /dev/null +++ b/tests/build/root.build @@ -0,0 +1,14 @@ +# file : tests/build/root.build +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +using cxx + +hxx{*}: extension = hxx +cxx{*}: extension = cxx + +cxx.std = 11 + +# Every exe{} in this subproject is by default a test. +# +exe{*}: test = true diff --git a/tests/buildfile b/tests/buildfile new file mode 100644 index 0000000..0341b61 --- /dev/null +++ b/tests/buildfile @@ -0,0 +1,7 @@ +# file : tests/buildfile +# copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +d = basics/ +./: $d +include $d |