From 921c4c14c2999a03b9e649b5c9adec73b5cae0de Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 6 Sep 2010 14:26:25 +0200 Subject: Add automake build support --- Makefile.am | 13 +++ README | 0 bootstrap | 18 +++ build/bootstrap.make | 14 ++- build/mysql/configure | 2 +- common/Makefile.am | 10 ++ common/auto/makefile | 14 ++- common/lifecycle/makefile | 14 ++- common/makefile | 26 ++++- common/query/makefile | 17 ++- common/schema/makefile | 14 ++- common/template/Makefile.am | 24 ++++ common/template/makefile | 14 ++- common/threads/makefile | 15 ++- configure.ac | 67 +++++++++++ libcommon/Makefile.am | 12 ++ libcommon/common.cxx | 4 + libcommon/common.hxx | 4 +- libcommon/config.h.in | 15 +++ libcommon/export.hxx | 39 +++++++ libcommon/makefile | 53 +++++++-- m4/acx-pthread.m4 | 254 +++++++++++++++++++++++++++++++++++++++++ m4/database.m4 | 41 +++++++ m4/diff.m4 | 55 +++++++++ m4/libodb-mysql.m4 | 84 ++++++++++++++ m4/libodb-tracer.m4 | 84 ++++++++++++++ m4/libodb.m4 | 83 ++++++++++++++ m4/libtool-link.m4 | 31 +++++ m4/mysql.m4 | 270 ++++++++++++++++++++++++++++++++++++++++++++ m4/odb.m4 | 45 ++++++++ m4/static-lib.m4 | 19 ++++ m4/threads.m4 | 41 +++++++ makefile | 45 ++++++-- mysql/Makefile.am | 6 + mysql/makefile | 12 +- mysql/template/Makefile.am | 27 +++++ mysql/template/makefile | 13 ++- mysql/truncation/makefile | 13 ++- mysql/types/makefile | 17 ++- mysql/types/test.mk | 4 + tester.in | 31 +++++ tracer/Makefile.am | 6 + tracer/makefile | 9 ++ tracer/object/makefile | 13 ++- tracer/template/Makefile.am | 25 ++++ tracer/template/driver.cxx | 35 ++++++ tracer/template/makefile | 92 +++++++++++++++ tracer/template/test.hxx | 27 +++++ tracer/template/test.std | 3 + tracer/transaction/makefile | 11 ++ tracer/types/makefile | 13 ++- 51 files changed, 1754 insertions(+), 44 deletions(-) create mode 100644 Makefile.am create mode 100644 README create mode 100755 bootstrap create mode 100644 common/Makefile.am create mode 100644 common/template/Makefile.am create mode 100644 configure.ac create mode 100644 libcommon/Makefile.am create mode 100644 libcommon/config.h.in create mode 100644 libcommon/export.hxx create mode 100644 m4/acx-pthread.m4 create mode 100644 m4/database.m4 create mode 100644 m4/diff.m4 create mode 100644 m4/libodb-mysql.m4 create mode 100644 m4/libodb-tracer.m4 create mode 100644 m4/libodb.m4 create mode 100644 m4/libtool-link.m4 create mode 100644 m4/mysql.m4 create mode 100644 m4/odb.m4 create mode 100644 m4/static-lib.m4 create mode 100644 m4/threads.m4 create mode 100644 mysql/Makefile.am create mode 100644 mysql/template/Makefile.am create mode 100644 mysql/types/test.mk create mode 100755 tester.in create mode 100644 tracer/Makefile.am create mode 100644 tracer/template/Makefile.am create mode 100644 tracer/template/driver.cxx create mode 100644 tracer/template/makefile create mode 100644 tracer/template/test.hxx create mode 100644 tracer/template/test.std diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..600707e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,13 @@ +# file : Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +SUBDIRS = libcommon tracer common + +if DB_ID_MYSQL +SUBDIRS += mysql +endif + +EXTRA_DIST = __file__(extra_dist) +ACLOCAL_AMFLAGS = -I m4 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..ceb2ea7 --- /dev/null +++ b/bootstrap @@ -0,0 +1,18 @@ +#! /bin/sh + +# file : bootstrap +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +# +# Bootstrap the automake build system. +# + +rm -f config.cache + +if test ! -d m4; then + mkdir m4 +fi + +autoreconf --install diff --git a/build/bootstrap.make b/build/bootstrap.make index 12d3425..59a62a2 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -32,17 +32,27 @@ $(call include,$(bld_root)/cxx/configuration.make) # .PHONY: $(out_base)/ \ $(out_base)/.test \ + $(out_base)/.dist \ $(out_base)/.clean ifdef %interactive% -.PHONY: test clean +.PHONY: test dist clean -test: $(out_base)/.test +test: $(out_base)/.test +dist: $(out_base)/.dist clean: $(out_base)/.clean endif +# Make sure the distribution prefix is set if the goal is dist. +# +ifneq ($(filter $(MAKECMDGOALS),dist),) +ifeq ($(dist_prefix),) +$(error dist_prefix is not set) +endif +endif + # If we don't have dependency auto-generation then we need to manually # make sure that ODB files are generated before C++ file are compiler. # To do this we make the object files ($2) depend in order-only on diff --git a/build/mysql/configure b/build/mysql/configure index e4bae87..c1d6382 100755 --- a/build/mysql/configure +++ b/build/mysql/configure @@ -39,7 +39,7 @@ $echo $echo "Please enter the MySQL database host." $echo -host=`read_value "localhost"` +host=`read_value ""` $echo $echo "Please enter the MySQL database port." diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..a526e4c --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,10 @@ +# file : common/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +SUBDIRS = __path__(dirs) + +if ODB_TESTS_THREADS +SUBDIRS += __path__(thread_dirs) +endif diff --git a/common/auto/makefile b/common/auto/makefile index 31c7efb..b39759a 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,7 +35,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -44,6 +45,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/common/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -72,6 +81,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile index 21278fc..73cc2e4 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,7 +35,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -44,6 +45,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/common/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -72,6 +81,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/common/makefile b/common/makefile index 1e56ecb..ef085e9 100644 --- a/common/makefile +++ b/common/makefile @@ -12,14 +12,30 @@ template \ lifecycle \ query -tests += threads +thread_tests := threads + +all_tests := $(tests) $(thread_tests) +build_tests := $(tests) $(thread_tests) default := $(out_base)/ +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) + +$(dist): export dirs := $(tests) +$(dist): export thread_dirs := $(thread_tests) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) + $(call meta-automake) + +$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests))) + +$(call include,$(bld_root)/dist.make) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist clean),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif diff --git a/common/query/makefile b/common/query/makefile index 5389d55..27e19e8 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,8 +35,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema \ ---generate-query --hxx-prologue '\\\#include "traits.hxx"' +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ +--generate-query --hxx-prologue '\#include "traits.hxx"' $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -45,6 +46,15 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) traits.hxx test.std +$(dist): export extra_headers := traits.hxx +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/common/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -73,6 +83,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/common/schema/makefile b/common/schema/makefile index 29cca5f..de22c01 100644 --- a/common/schema/makefile +++ b/common/schema/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,7 +35,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -44,6 +45,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/common/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -72,6 +81,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/common/template/Makefile.am b/common/template/Makefile.am new file mode 100644 index 0000000..b2fc122 --- /dev/null +++ b/common/template/Makefile.am @@ -0,0 +1,24 @@ +# file : common/template/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +noinst_PROGRAMS = driver +driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) +driver_LDADD = $(top_builddir)/libcommon/libcommon.la +driver_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' + +TESTS=$(top_builddir)/tester +TESTS_ENVIRONMENT=top_builddir=$(top_builddir); + +# ODB compilation. +# +driver_SOURCES += test.hxx test-odb.cxx +BUILT_SOURCES = test-odb.hxx +CLEANFILES = test-odb.hxx test-odb.ixx test-odb.cxx + +ODB = @ODB@ +ODBFLAGS = @ODBFLAGS@ + +test-odb.hxx: test.hxx + $(ODB) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< diff --git a/common/template/makefile b/common/template/makefile index c963659..cdc8f91 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,7 +35,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -44,6 +45,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -72,6 +81,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/common/threads/makefile b/common/threads/makefile index af03a93..6a8c802 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -34,7 +35,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema --generate-query +$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ +--generate-query $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -44,6 +46,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): db_id := @database@ +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/common/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -72,6 +82,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..bdc5afa --- /dev/null +++ b/configure.ac @@ -0,0 +1,67 @@ +# file : configure.ac +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +AC_PREREQ(2.60) +AC_INIT([odb-tests], [__value__(version)], [odb-users@codesynthesis.com]) +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([tracer/template/driver.cxx]) + +AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar]) + +LT_INIT([win32-dll]) + +AC_CANONICAL_HOST + +# Check for C++ compiler and use it to compile the tests. +# +AC_PROG_CXX +AC_LANG(C++) + +# Create the libtool executable so that we can use it in further tests. +# +LT_OUTPUT + +# Check for threads. +# +THREADS + +AM_CONDITIONAL([ODB_TESTS_THREADS], [test x$threads != xnone]) + +# Check for the ODB libs. +# +LIBODB([], [AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])]) +LIBODB_TRACER([], [AC_MSG_ERROR([libodb-tracer is not found; consider using --with-libodb-tracer=DIR])]) + +# Check which database we are using. +# +DATABASE + +case $database in + mysql) + LIBODB_MYSQL([], [AC_MSG_ERROR([libodb-mysql is not found; consider using --with-libodb-mysql=DIR])]) + MYSQL + ;; +esac + +# Check for the ODB compiler. +# +ODB_COMPILER([], [AC_MSG_ERROR([odb compiler is not found; consider setting ODB variable or using --with-odb=DIR])]) + +# Check for diff. +# +DIFF_TOOL + +# Define LIBCOMMON_STATIC_LIB if we are build static library on certain +# platforms. +# +STATIC_LIB([LIBCOMMON_STATIC_LIB], [Static library interface.]) + +# Output. +# +AC_CONFIG_HEADERS([config.h libcommon/config.h]) +AC_CONFIG_FILES([__path__(config_files)]) +AC_CONFIG_COMMANDS([tester-mode], [chmod +x tester]) +AC_OUTPUT diff --git a/libcommon/Makefile.am b/libcommon/Makefile.am new file mode 100644 index 0000000..d42cff2 --- /dev/null +++ b/libcommon/Makefile.am @@ -0,0 +1,12 @@ +# file : libcommon/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +noinst_LTLIBRARIES = libcommon.la +libcommon_la_SOURCES = __path__(sources) __path__(headers) + +EXTRA_DIST = __file__(extra_dist) + +libcommon_la_CPPFLAGS= -I'$(builddir)' -I'$(srcdir)' -DLIBCOMMON_DYNAMIC_LIB +libcommon_la_LDFLAGS = -no-undefined -rpath '$(libdir)' diff --git a/libcommon/common.cxx b/libcommon/common.cxx index bfc3482..0c88818 100644 --- a/libcommon/common.cxx +++ b/libcommon/common.cxx @@ -6,6 +6,10 @@ #include // std::exit #include +#ifndef _MSC_VER +# include +#endif + #ifdef DB_ID_MYSQL # include #endif diff --git a/libcommon/common.hxx b/libcommon/common.hxx index 8e5bd4d..411ece5 100644 --- a/libcommon/common.hxx +++ b/libcommon/common.hxx @@ -10,7 +10,9 @@ #include -std::auto_ptr +#include + +LIBCOMMON_EXPORT std::auto_ptr create_database (int argc, char* argv[]); #endif // LIBCOMMON_COMMON_HXX diff --git a/libcommon/config.h.in b/libcommon/config.h.in new file mode 100644 index 0000000..9d18901 --- /dev/null +++ b/libcommon/config.h.in @@ -0,0 +1,15 @@ +/* file : libcommon/config.h.in + * author : Boris Kolpackov + * copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef LIBCOMMON_CONFIG_H +#define LIBCOMMON_CONFIG_H + +#undef DB_ID_MYSQL +#undef LIBCOMMON_STATIC_LIB + +#endif /* LIBCOMMON_CONFIG_H */ diff --git a/libcommon/export.hxx b/libcommon/export.hxx new file mode 100644 index 0000000..8bbb96c --- /dev/null +++ b/libcommon/export.hxx @@ -0,0 +1,39 @@ +// file : libcommon/export.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef LIBCOMMON_EXPORT_HXX +#define LIBCOMMON_EXPORT_HXX + +#ifndef _MSC_VER +# include +#endif + +#ifdef LIBCOMMON_STATIC_LIB +# define LIBCOMMON_EXPORT +#else +# ifdef _WIN32 +# ifdef _MSC_VER +# ifdef LIBCOMMON_DYNAMIC_LIB +# define LIBCOMMON_EXPORT __declspec(dllexport) +# else +# define LIBCOMMON_EXPORT __declspec(dllimport) +# endif +# else +# ifdef LIBCOMMON_DYNAMIC_LIB +# ifdef DLL_EXPORT +# define LIBCOMMON_EXPORT __declspec(dllexport) +# else +# define LIBCOMMON_EXPORT +# endif +# else +# define LIBCOMMON_EXPORT __declspec(dllimport) +# endif +# endif +# else +# define LIBCOMMON_EXPORT +# endif +#endif + +#endif // LIBCOMMON_EXPORT_HXX diff --git a/libcommon/makefile b/libcommon/makefile index 44c789a..cdb57bc 100644 --- a/libcommon/makefile +++ b/libcommon/makefile @@ -16,8 +16,9 @@ cxx_od := $(cxx_obj:.o=.o.d) common.l := $(out_base)/common.l common.l.cpp-options := $(out_base)/common.l.cpp-options -default := $(out_base)/ -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean # Import. # @@ -43,14 +44,10 @@ endif # $(common.l): $(cxx_obj) $(odb.l) $(odb_db.l) -$(cxx_obj) $(cxx_od): $(common.l.cpp-options) -$(common.l.cpp-options): value := -I$(src_base) +$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(out_base)/config.h +$(common.l.cpp-options): value := -I$(out_base) -I$(src_base) $(common.l.cpp-options): $(odb_db.l.cpp-options) $(odb.l.cpp-options) -ifeq ($(db_id),mysql) -$(cxx_obj): cpp_options += -DDB_ID_MYSQL -endif - genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx) gen := $(addprefix $(out_base)/,$(genf)) @@ -63,19 +60,59 @@ $(gen): cli_options += \ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) +$(out_base)/config.h: $(dcf_root)/configuration-dynamic.make + @echo '// file : libcommon/config.h' >$@ + @echo '// author : automatically generated' >>$@ + @echo '' >>$@ + @echo '#ifndef LIBCOMMON_CONFIG_H' >>$@ + @echo '#define LIBCOMMON_CONFIG_H' >>$@ + @echo '' >>$@ +ifeq ($(db_id),mysql) + @echo '#define DB_ID_MYSQL 1' >>$@ +endif + @echo '' >>$@ + @echo '#endif // LIBCOMMON_CONFIG_H' >>$@ + # Convenience alias for default target. # $(out_base)/: $(common.l) +# Dist. +# +$(dist): export sources := $(cxx_tun) $(cli_tun:.cli=.cxx) +$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): data_dist := $(cli_tun) +$(dist): export extra_dist := $(data_dist) + +$(dist): $(gen) + $(call dist-data,$(sources) $(headers) $(data_dist) config.h.in) + $(call meta-automake) + # Clean. # $(clean): $(common.l).o.clean \ $(common.l.cpp-options).clean \ $(addsuffix .cxx.clean,$(cxx_obj)) \ $(addsuffix .cxx.clean,$(cxx_od)) + $(call message,rm $$1,rm -f $$1,$(out_base)/config.h) + +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(common.l): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := config.h +$(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/automake.make) + $(call include,$(cli_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/m4/acx-pthread.m4 b/m4/acx-pthread.m4 new file mode 100644 index 0000000..feeb01d --- /dev/null +++ b/m4/acx-pthread.m4 @@ -0,0 +1,254 @@ +dnl +dnl NOTE: This file was modified. See the comments starting with 'CS:' +dnl for more information. In particular, it was changed to use C++ +dnl instead of C. +dnl +dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl @summary figure out how to build C++ programs using POSIX threads +dnl +dnl This macro figures out how to build C++ programs using POSIX threads. +dnl It sets the PTHREAD_LIBS output variable to the threads library and +dnl linker flags, and the PTHREAD_CXXFLAGS output variable to any special +dnl C++ compiler flags that are needed. (The user can also force certain +dnl compiler flags/libs to be tested by setting these environment +dnl variables.) +dnl +dnl Also sets PTHREAD_CXX to any special C++ compiler that is needed for +dnl multi-threaded programs (defaults to the value of CXX otherwise). +dnl (This is necessary on AIX to use the special xlC_r compiler alias.) +dnl +dnl NOTE: You are assumed to not only compile your program with these +dnl flags, but also link it with them as well. e.g. you should link +dnl with $PTHREAD_CXX $CXXFLAGS $PTHREAD_CXXFLAGS $LDFLAGS ... $PTHREAD_LIBS +dnl $LIBS +dnl +dnl If you are only building threads programs, you may wish to use +dnl these variables in your default LIBS, CXXFLAGS, and CXX: +dnl +dnl LIBS="$PTHREAD_LIBS $LIBS" +dnl CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" +dnl CXX="$PTHREAD_CXX" +dnl +dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute +dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to +dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +dnl +dnl ACTION-IF-FOUND is a list of shell commands to run if a threads +dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to +dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the +dnl default action will define HAVE_PTHREAD. +dnl +dnl Please let the authors know if this macro fails on any platform, or +dnl if you have any other suggestions or comments. This macro was based +dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with +dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros +dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. +dnl We are also grateful for the helpful feedback of numerous users. +dnl +dnl @category InstalledPackages +dnl @author Steven G. Johnson +dnl @version 2006-05-29 +dnl @license GPLWithACException + +AC_DEFUN([ACX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_SAVE +AC_LANG(C++) +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CXXFLAGS" != x; then + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CXXFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_MSG_RESULT($acx_pthread_ok) + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CXXFLAGS="" + fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +# CS: On GNU/Linux with gcc both -pthread and -lpthread are valid. +# However, libtool links libraries with -nostdlib which results in +# -pthread being stripped from the linker command line. To resolve +# this we move pthread from after -mthreads to after pthreads. +# +acx_pthread_flags="pthreads pthread none -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CXXFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CXXFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CXXFLAGS="$CXXFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + # + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0);], + [acx_pthread_ok=yes]) + + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CXXFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + +dnl # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. +dnl AC_MSG_CHECKING([for joinable pthread attribute]) +dnl attr_name=unknown +dnl for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do +dnl AC_TRY_LINK([#include ], [int attr=$attr; return attr;], +dnl [attr_name=$attr; break]) +dnl done +dnl AC_MSG_RESULT($attr_name) +dnl if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then +dnl AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, +dnl [Define to necessary symbol if this constant +dnl uses a non-standard name on your system.]) +dnl fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CXXFLAGS="$flag $PTHREAD_CXXFLAGS" + fi + + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + +dnl # More AIX lossage: must compile with xlC_r +dnl if test x"$GXX" != xyes; then +dnl AC_CHECK_PROGS(PTHREAD_CXX, xlC_r, ${CXX}) +dnl else +dnl PTHREAD_CXX=$CXX +dnl fi + +else + PTHREAD_CXX="$CXX" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CXXFLAGS) +AC_SUBST(PTHREAD_CXX) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + acx_pthread_ok=no + $2 +fi +AC_LANG_RESTORE +])dnl ACX_PTHREAD diff --git a/m4/database.m4 b/m4/database.m4 new file mode 100644 index 0000000..8fca493 --- /dev/null +++ b/m4/database.m4 @@ -0,0 +1,41 @@ +dnl file : m4/database.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl DATABASE +dnl +AC_DEFUN([DATABASE], [ +database=none + +AC_MSG_CHECKING([for database to use]) + +AC_ARG_WITH( + [database], + [AC_HELP_STRING([--with-database=db], + [database to use for tests; valid values are: 'mysql'])], + [case $withval in + no | yes) + AC_MSG_RESULT([]) + AC_MSG_ERROR([no database specified in the --with-database option]) + ;; + mysql) + database=mysql + AC_DEFINE([DB_ID_MYSQL], [1], [Using MySQL.]) + ;; + *) + AC_MSG_RESULT([]) + AC_MSG_ERROR([unknown database $withval]) + ;; + esac], + [ + AC_MSG_RESULT([]) + AC_MSG_ERROR([no database specified with the --with-database option]) + ]) + +AC_MSG_RESULT([$database]) +AC_SUBST([database]) + +AM_CONDITIONAL([DB_ID_MYSQL], [test x$database = xmysql]) + +])dnl diff --git a/m4/diff.m4 b/m4/diff.m4 new file mode 100644 index 0000000..5401748 --- /dev/null +++ b/m4/diff.m4 @@ -0,0 +1,55 @@ +dnl file : m4/diff.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl DIFF_TOOL +dnl +AC_DEFUN([DIFF_TOOL], [ +diff_found=no + +AC_ARG_VAR([DIFF],[diff command]) +AC_ARG_VAR([DIFFFLAGS],[diff flags]) + +AC_ARG_WITH( + [diff], + [AC_HELP_STRING([--with-diff=PATH],[path to the diff program])], + [diff_path=${withval}], + [diff_path=]) + +AC_MSG_CHECKING([for diff]) + +if test x"$DIFF" = x; then + if test x"$diff_path" != x; then + AS_SET_CATFILE([abs_diff_path], [$ac_pwd], [$diff_path]) + DIFF="$abs_diff_path" + else + DIFF=diff + fi +fi + +cat >conftest.txt + +$DIFF conftest.txt conftest.txt 2>/dev/null 1>&2 + +if test x"$?" = x0; then + AC_MSG_RESULT([$DIFF]) +else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([diff command is not found; consider setting the DIFF variable or using --with-diff=PATH]) +fi + +AC_MSG_CHECKING([whether $DIFF accepts -u]) + +$DIFF -u conftest.txt conftest.txt 2>/dev/null 1>&2 + +if test x"$?" = x0; then + AC_MSG_RESULT([yes]) + DIFFFLAGS="$DIFFFLAGS -u" +else + AC_MSG_RESULT([no]) +fi + +rm -f conftest.txt + +])dnl diff --git a/m4/libodb-mysql.m4 b/m4/libodb-mysql.m4 new file mode 100644 index 0000000..13e3ff3 --- /dev/null +++ b/m4/libodb-mysql.m4 @@ -0,0 +1,84 @@ +dnl file : m4/libodb-mysql.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl LIBODB_MYSQL([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl +AC_DEFUN([LIBODB_MYSQL], [ +libodb_mysql_found=no + +AC_ARG_WITH( + [libodb-mysql], + [AC_HELP_STRING([--with-libodb-mysql=DIR],[location of libodb-mysql build directory])], + [libodb_mysql_dir=${withval}], + [libodb_mysql_dir=]) + +AC_MSG_CHECKING([for libodb-mysql]) + +# If libodb_mysql_dir was given, add the necessary preprocessor and +# linker flags. +# +if test x"$libodb_mysql_dir" != x; then + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + + AS_SET_CATFILE([abs_libodb_mysql_dir], [$ac_pwd], [$libodb_mysql_dir]) + + CPPFLAGS="$CPPFLAGS -I$abs_libodb_mysql_dir" + LDFLAGS="$LDFLAGS -L$abs_libodb_mysql_dir/odb/mysql" +fi + +save_LIBS="$LIBS" +LIBS="-lodb-mysql $LIBS" + +CXX_LIBTOOL_LINK_IFELSE( +AC_LANG_SOURCE([[ +#include + +void +f () +{ +} + +const char* +g () +{ + try + { + f (); + } + catch (const odb::mysql::database_exception& e) + { + return e.what (); + } + return 0; +} + +int +main () +{ + const char* m (g ()); + return m != 0; +} +]]), +[libodb_mysql_found=yes]) + +if test x"$libodb_mysql_found" = xno; then + LIBS="$save_LIBS" + + if test x"$libodb_mysql_dir" != x; then + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + fi +fi + +if test x"$libodb_mysql_found" = xyes; then + AC_MSG_RESULT([yes]) + $1 +else + AC_MSG_RESULT([no]) + $2 +fi +])dnl diff --git a/m4/libodb-tracer.m4 b/m4/libodb-tracer.m4 new file mode 100644 index 0000000..bd7a371 --- /dev/null +++ b/m4/libodb-tracer.m4 @@ -0,0 +1,84 @@ +dnl file : m4/libodb-tracer.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl LIBODB_TRACER([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl +AC_DEFUN([LIBODB_TRACER], [ +libodb_tracer_found=no + +AC_ARG_WITH( + [libodb-tracer], + [AC_HELP_STRING([--with-libodb-tracer=DIR],[location of libodb-tracer build directory])], + [libodb_tracer_dir=${withval}], + [libodb_tracer_dir=]) + +AC_MSG_CHECKING([for libodb-tracer]) + +# If libodb_tracer_dir was given, add the necessary preprocessor and +# linker flags. +# +if test x"$libodb_tracer_dir" != x; then + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + + AS_SET_CATFILE([abs_libodb_tracer_dir], [$ac_pwd], [$libodb_tracer_dir]) + + CPPFLAGS="$CPPFLAGS -I$abs_libodb_tracer_dir" + LDFLAGS="$LDFLAGS -L$abs_libodb_tracer_dir/odb/tracer" +fi + +save_LIBS="$LIBS" +LIBS="-lodb-tracer $LIBS" + +CXX_LIBTOOL_LINK_IFELSE( +AC_LANG_SOURCE([[ +#include + +void +f () +{ +} + +const char* +g () +{ + try + { + f (); + } + catch (const odb::tracer::database_exception& e) + { + return e.what (); + } + return 0; +} + +int +main () +{ + const char* m (g ()); + return m != 0; +} +]]), +[libodb_tracer_found=yes]) + +if test x"$libodb_tracer_found" = xno; then + LIBS="$save_LIBS" + + if test x"$libodb_tracer_dir" != x; then + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + fi +fi + +if test x"$libodb_tracer_found" = xyes; then + AC_MSG_RESULT([yes]) + $1 +else + AC_MSG_RESULT([no]) + $2 +fi +])dnl diff --git a/m4/libodb.m4 b/m4/libodb.m4 new file mode 100644 index 0000000..a205afd --- /dev/null +++ b/m4/libodb.m4 @@ -0,0 +1,83 @@ +dnl file : m4/libodb.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl LIBODB([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +dnl +AC_DEFUN([LIBODB], [ +libodb_found=no + +AC_ARG_WITH( + [libodb], + [AC_HELP_STRING([--with-libodb=DIR],[location of libodb build directory])], + [libodb_dir=${withval}], + [libodb_dir=]) + +AC_MSG_CHECKING([for libodb]) + +# If libodb_dir was given, add the necessary preprocessor and linker flags. +# +if test x"$libodb_dir" != x; then + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + + AS_SET_CATFILE([abs_libodb_dir], [$ac_pwd], [$libodb_dir]) + + CPPFLAGS="$CPPFLAGS -I$abs_libodb_dir" + LDFLAGS="$LDFLAGS -L$abs_libodb_dir/odb" +fi + +save_LIBS="$LIBS" +LIBS="-lodb $LIBS" + +CXX_LIBTOOL_LINK_IFELSE( +AC_LANG_SOURCE([[ +#include + +void +f () +{ +} + +const char* +g () +{ + try + { + f (); + } + catch (const odb::exception& e) + { + return e.what (); + } + return 0; +} + +int +main () +{ + const char* m (g ()); + return m != 0; +} +]]), +[libodb_found=yes]) + +if test x"$libodb_found" = xno; then + LIBS="$save_LIBS" + + if test x"$libodb_dir" != x; then + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + fi +fi + +if test x"$libodb_found" = xyes; then + AC_MSG_RESULT([yes]) + $1 +else + AC_MSG_RESULT([no]) + $2 +fi +])dnl diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4 new file mode 100644 index 0000000..229b270 --- /dev/null +++ b/m4/libtool-link.m4 @@ -0,0 +1,31 @@ +dnl file : m4/libtool-link.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl +dnl CXX_LIBTOOL_LINK_IFELSE (input, [action-if-true], [action-if-false]) +dnl +dnl Similar to AC_LINK_IFELSE except it uses libtool to perform the +dnl linking and it does this using the C++ compiler. +dnl +AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[ +AC_LANG_SAVE +save_CXX="$CXX" +CXX="./libtool --tag=CXX --mode=link $CXX -no-install" +AC_LANG(C++) + +if test -d .libs; then + delete_libs_dir=no +else + delete_libs_dir=yes +fi + +AC_LINK_IFELSE([$1], [$2], [$3]) + +if test x"$delete_libs_dir" != xyes; then + rm -rf .libs +fi + +CXX="$save_CXX" +AC_LANG_RESTORE])dnl diff --git a/m4/mysql.m4 b/m4/mysql.m4 new file mode 100644 index 0000000..f40ba6d --- /dev/null +++ b/m4/mysql.m4 @@ -0,0 +1,270 @@ +dnl file : m4/mysql.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl MYSQL +dnl +AC_DEFUN([MYSQL], [ + +# Client. +# +AC_MSG_CHECKING([for mysql client program]) +AC_ARG_WITH( + [mysql-client], + [AC_HELP_STRING([--with-mysql-client=path], [MySQL client program path (mysql by default)])], + [case $withval in + yes) + mysql_client=mysql + ;; + no) + AC_MSG_RESULT([]) + AC_MSG_ERROR([need mysql client to run the tests]) + ;; + *) + mysql_client=$withval + ;; + esac], + [mysql_client=mysql]) + +$mysql_client --version 2>/dev/null 1>&2 + +if test x"$?" = x0; then + AC_MSG_RESULT([$mysql_client]) +else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([mysql client is not found; consider using --with-mysql-client=PATH]) +fi + +# User. +# +AC_MSG_CHECKING([for mysql database user]) +AC_ARG_WITH( + [mysql-user], + [AC_HELP_STRING([--with-mysql-user=login], [MySQL database user (odb_test by default)])], + [case $withval in + yes) + mysql_user=odb_test + mysql_user_set=yes + ;; + no) + mysql_user_set=no + ;; + *) + mysql_user=$withval + mysql_user_set=yes + ;; + esac], + [mysql_user=odb_test + mysql_user_set=yes]) + +if test x$mysql_user_set = xyes; then + AC_MSG_RESULT(['$mysql_user']) +else + AC_MSG_RESULT([none]) +fi + +# Password. +# +AC_MSG_CHECKING([for mysql database password]) +AC_ARG_WITH( + [mysql-password], + [AC_HELP_STRING([--with-mysql-password=login], [MySQL database password (no password by default)])], + [case $withval in + yes) + mysql_password= + mysql_password_set=yes + ;; + no) + mysql_password_set=no + ;; + *) + mysql_password=$withval + mysql_password_set=yes + ;; + esac], + [mysql_password_set=no]) + +if test x$mysql_password_set = xyes; then + AC_MSG_RESULT(['$mysql_password']) +else + AC_MSG_RESULT([none]) +fi + +# Database name. +# +AC_MSG_CHECKING([for mysql database name]) +AC_ARG_WITH( + [mysql-db], + [AC_HELP_STRING([--with-mysql-db=name], [MySQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])], + [case $withval in + yes) + mysql_db=odb_test + mysql_db_set=yes + ;; + no) + mysql_db_set=no + ;; + *) + mysql_db=$withval + mysql_db_set=yes + ;; + esac], + [mysql_db=odb_test + mysql_db_set=yes]) + +if test x$mysql_db_set = xyes; then + AC_MSG_RESULT(['$mysql_db']) +else + AC_MSG_RESULT([none]) +fi + +# Host. +# +AC_MSG_CHECKING([for mysql database host]) +AC_ARG_WITH( + [mysql-host], + [AC_HELP_STRING([--with-mysql-host=host], [MySQL database host (localhost by default)])], + [case $withval in + yes) + mysql_host=localhost + mysql_host_set=yes + ;; + no) + mysql_host_set=no + ;; + *) + mysql_host=$withval + mysql_host_set=yes + ;; + esac], + [mysql_host_set=no]) + +if test x$mysql_host_set = xyes; then + AC_MSG_RESULT(['$mysql_host']) +else + AC_MSG_RESULT([localhost]) +fi + +# Port. +# +AC_MSG_CHECKING([for mysql database port]) +AC_ARG_WITH( + [mysql-port], + [AC_HELP_STRING([--with-mysql-port=port], [MySQL database port (standard MySQL port by default)])], + [case $withval in + yes) + mysql_port=0 + mysql_port_set=yes + ;; + no) + mysql_port_set=no + ;; + *) + mysql_port=$withval + mysql_port_set=yes + ;; + esac], + [mysql_port_set=no]) + +if test x$mysql_port_set = xyes; then + AC_MSG_RESULT(['$mysql_port']) +else + AC_MSG_RESULT([default]) +fi + +# Socket. +# +AC_MSG_CHECKING([for mysql database socket]) +AC_ARG_WITH( + [mysql-socket], + [AC_HELP_STRING([--with-mysql-socket=socket], [MySQL database socket (standard MySQL socket by default)])], + [case $withval in + yes) + mysql_socket= + mysql_socket_set=yes + ;; + no) + mysql_socket_set=no + ;; + *) + mysql_socket=$withval + mysql_socket_set=yes + ;; + esac], + [mysql_socket_set=no]) + +if test x$mysql_socket_set = xyes; then + AC_MSG_RESULT(['$mysql_socket']) +else + AC_MSG_RESULT([default]) +fi + +# Create options file. +# +AC_CONFIG_COMMANDS([db.options], + [ + rm -f db.options + echo '#! /bin/sh' >db-driver + + if test x$mysql_user_set = xyes; then + echo "--user '$mysql_user'" >>db.options + echo 'opt="$opt --user='"$mysql_user"'"' >>db-driver + fi + + if test x$mysql_password_set = xyes; then + echo "--passwd '$mysql_password'" >>db.options + echo 'opt="$opt --password='"$mysql_password"'"' >>db-driver + fi + + if test x$mysql_db_set = xyes; then + echo "--db-name '$mysql_db'" >>db.options + echo 'opt="$opt --database='"$mysql_db"'"' >>db-driver + fi + + if test x$mysql_host_set = xyes; then + echo "--host '$mysql_host'" >>db.options + echo 'opt="$opt --host='"$mysql_host"'"' >>db-driver + fi + + if test x$mysql_port_set = xyes; then + echo "--port '$mysql_port'" >>db.options + echo 'opt="$opt --port='"$mysql_port"'"' >>db-driver + fi + + if test x$mysql_socket_set = xyes; then + echo "--socket '$mysql_socket'" >>db.options + echo 'opt="$opt --socket='"$mysql_socket"'"' >>db-driver + fi + + echo 'if test x$[]1 != x; then' >>db-driver + echo " exec $mysql_client "'$opt <$[]1' >>db-driver + echo "else" >>db-driver + echo " exec $mysql_client "'$opt' >>db-driver + echo "fi" >>db-driver + + chmod +x db-driver + ], + [ + mysql_client="$mysql_client" + + mysql_user="$mysql_user" + mysql_user_set="$mysql_user_set" + + mysql_password="$mysql_password" + mysql_password_set="$mysql_password_set" + + mysql_db="$mysql_db" + mysql_db_set="$mysql_db_set" + + mysql_host="$mysql_host" + mysql_host_set="$mysql_host_set" + + mysql_port="$mysql_port" + mysql_port_set="$mysql_port_set" + + mysql_socket="$mysql_socket" + mysql_socket_set="$mysql_socket_set" + ]) + +])dnl diff --git a/m4/odb.m4 b/m4/odb.m4 new file mode 100644 index 0000000..b632f8c --- /dev/null +++ b/m4/odb.m4 @@ -0,0 +1,45 @@ +dnl file : m4/odb.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl ODB_COMPILER([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +dnl +AC_DEFUN([ODB_COMPILER], [ +odb_found=no + +AC_ARG_VAR([ODB],[ODB compiler command]) +AC_ARG_VAR([ODBFLAGS],[ODB compiler flags]) +AC_ARG_VAR([ODBCPPFLAGS],[ODB-specific C++ preprocessor flags]) + +AC_ARG_WITH( + [odb], + [AC_HELP_STRING([--with-odb=DIR],[location of odb build directory])], + [odb_dir=${withval}], + [odb_dir=]) + +AC_MSG_CHECKING([for odb]) + +save_ODB="$ODB" + +if test x"$ODB" = x; then + if test x"$odb_dir" != x; then + AS_SET_CATFILE([abs_odb_dir], [$ac_pwd], [$odb_dir]) + ODB="$abs_odb_dir/odb/odb" + else + ODB=odb + fi +fi + +$ODB --version 2>/dev/null 1>&2 + +if test x"$?" = x0; then + AC_MSG_RESULT([$ODB]) + $1 +else + AC_MSG_RESULT([no]) + ODB="$save_ODB" + $2 +fi + +])dnl diff --git a/m4/static-lib.m4 b/m4/static-lib.m4 new file mode 100644 index 0000000..1c0af42 --- /dev/null +++ b/m4/static-lib.m4 @@ -0,0 +1,19 @@ +dnl file : m4/static-lib.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl STATIC_LIB(MACRO, DESCRIPTION) +dnl +dnl Define MACRO if we are on MinGW and are only building static library. +dnl +AC_DEFUN([STATIC_LIB], +[ +if test x$enable_shared = xno; then + case $host_os in + mingw*) + AC_DEFINE([$1], [1], [$2]) + ;; + esac +fi +])dnl diff --git a/m4/threads.m4 b/m4/threads.m4 new file mode 100644 index 0000000..7c32abe --- /dev/null +++ b/m4/threads.m4 @@ -0,0 +1,41 @@ +dnl file : m4/threads.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +AC_DEFUN([THREADS],[ + +AC_ARG_ENABLE( + [threads], + AS_HELP_STRING([--disable-threads], [disable threads (enabled by default)]), + [AS_IF([test x"$enableval" = xno], [threads=none], [threads=check])], + [threads=check]) + +# If thread support is not disabled by the user, figure out what we can use. +# +if test x$threads = xcheck; then + case $host_os in + windows* | mingw*) + case $host_os in + mingw*) + CXXFLAGS="$CXXFLAGS -mthreads" + ;; + esac + threads=win32 + ;; + *) + ACX_PTHREAD + + if test x$acx_pthread_ok = xyes; then + threads=posix + LIBS="$LIBS $PTHREAD_LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS" + fi + ;; + esac +fi + +if test x$threads = xcheck; then + AC_MSG_ERROR([thread support not available; use --disable-threads to force single-threaded mode]) +fi +])dnl diff --git a/makefile b/makefile index e3559a9..aba3aee 100644 --- a/makefile +++ b/makefile @@ -1,24 +1,45 @@ -# file : mysql/makefile +# file : makefile # author : Boris Kolpackov # copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC # license : GNU GPL; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make -tests := \ -common \ -tracer +all_dirs := libcommon common tracer mysql +dirs := common tracer ifeq ($(db_id),mysql) -tests += mysql +dirs += mysql endif -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +test := $(out_base)/.test +clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +$(dist): data_dist := GPLv2 LICENSE README version +$(dist): exec_dist := bootstrap tester.in +$(dist): export extra_dist := $(data_dist) $(exec_dist) +$(dist): export version = $(shell cat $(src_root)/version) + +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_dirs))) + $(call dist-data,$(data_dist)) + $(call dist-exec,$(exec_dist)) + $(call dist-dir,m4) + $(call meta-automake) + $(call meta-autoconf) + +$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_dirs))) + +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) +$(call include,$(bld_root)/meta/autoconf.make) + +ifneq ($(filter $(MAKECMDGOALS),dist clean),) +$(foreach d,$(all_dirs),$(call import,$(src_base)/$d/makefile)) +else +$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile)) +endif diff --git a/mysql/Makefile.am b/mysql/Makefile.am new file mode 100644 index 0000000..1e8c1c0 --- /dev/null +++ b/mysql/Makefile.am @@ -0,0 +1,6 @@ +# file : mysql/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +SUBDIRS = __path__(dirs) diff --git a/mysql/makefile b/mysql/makefile index ae1b83f..53dd049 100644 --- a/mysql/makefile +++ b/mysql/makefile @@ -6,16 +6,24 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make tests := \ +template \ truncation \ -types \ -template +types default := $(out_base)/ +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) + +$(dist): export dirs := $(tests) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) + $(call meta-automake) + $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(call include,$(bld_root)/meta/automake.make) + $(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/mysql/template/Makefile.am b/mysql/template/Makefile.am new file mode 100644 index 0000000..46c3bae --- /dev/null +++ b/mysql/template/Makefile.am @@ -0,0 +1,27 @@ +# file : mysql/template/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +noinst_PROGRAMS = driver +driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) +driver_LDADD = $(top_builddir)/libcommon/libcommon.la +driver_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon' + +TESTS=$(top_builddir)/tester +TESTS_ENVIRONMENT=top_builddir=$(top_builddir); + +m4_ifelse(__value__(odb_options),,, + +# ODB compilation. +# +driver_SOURCES += test.hxx test-odb.cxx +BUILT_SOURCES = test-odb.hxx +CLEANFILES = test-odb.hxx test-odb.ixx test-odb.cxx + +ODB = @ODB@ +ODBFLAGS = @ODBFLAGS@ + +test-odb.hxx: test.hxx + $(ODB) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< +) diff --git a/mysql/template/makefile b/mysql/template/makefile index a614597..28146f4 100644 --- a/mysql/template/makefile +++ b/mysql/template/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -40,7 +41,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database mysql --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -50,6 +51,13 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -78,6 +86,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/mysql/truncation/makefile b/mysql/truncation/makefile index 84eb4f3..f0d475d 100644 --- a/mysql/truncation/makefile +++ b/mysql/truncation/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -40,7 +41,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema +$(gen) $(dist): export odb_options += --database mysql --generate-schema $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -50,6 +51,13 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/mysql/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -78,6 +86,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/mysql/types/makefile b/mysql/types/makefile index c7c8742..859ef29 100644 --- a/mysql/types/makefile +++ b/mysql/types/makefile @@ -14,6 +14,7 @@ common.l := $(out_root)/libcommon/common.l common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -40,8 +41,9 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database $(db_id) --generate-schema \ ---generate-query --cxx-prologue '\\\#include "traits.hxx"' +$(gen) $(dist): export odb_options += --database mysql --generate-schema \ +--generate-query --cxx-prologue '\#include "traits.hxx"' + $(gen): cpp_options := -I$(out_base) $(gen): $(common.l.cpp-options) @@ -51,6 +53,14 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) traits.hxx test.std +$(dist): export extra_headers := traits.hxx +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/mysql/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -79,6 +89,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/mysql/types/test.mk b/mysql/types/test.mk new file mode 100644 index 0000000..693fc71 --- /dev/null +++ b/mysql/types/test.mk @@ -0,0 +1,4 @@ +v = '\#include "foo.hxx"' + +all: + echo $v diff --git a/tester.in b/tester.in new file mode 100755 index 0000000..b34c6ab --- /dev/null +++ b/tester.in @@ -0,0 +1,31 @@ +#! /bin/sh + +# file : tester.in +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +# +# Run an ODB test. The test driver is in the current directory. The +# data files, if any, are in $srcdir. +# + +if test -f test.sql; then + $top_builddir/db-driver test.sql + + if test $? -ne 0; then + exit 1 + fi +fi + +if test -f "$srcdir/test.std"; then + ./driver --options-file "$top_builddir/db.options" >test.out + + if test $? -ne 0; then + exit 1 + fi + + @DIFF@ @DIFFFLAGS@ "$srcdir/test.std" test.out +else + ./driver --options-file "$top_builddir/db.options" +fi diff --git a/tracer/Makefile.am b/tracer/Makefile.am new file mode 100644 index 0000000..32feb34 --- /dev/null +++ b/tracer/Makefile.am @@ -0,0 +1,6 @@ +# file : tracer/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +SUBDIRS = __path__(dirs) diff --git a/tracer/makefile b/tracer/makefile index 03b8747..731573a 100644 --- a/tracer/makefile +++ b/tracer/makefile @@ -6,16 +6,25 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make tests := \ +template \ object \ transaction \ types default := $(out_base)/ +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) + +$(dist): export dirs := $(tests) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) + $(call meta-automake) + $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(call include,$(bld_root)/meta/automake.make) + $(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tracer/object/makefile b/tracer/object/makefile index ed7c562..1fd819b 100644 --- a/tracer/object/makefile +++ b/tracer/object/makefile @@ -11,6 +11,7 @@ cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) cxx_od := $(cxx_obj:.o=.o.d) driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -39,7 +40,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database tracer +$(gen) $(dist): export odb_options += --database tracer $(gen): cpp_options := -I$(out_base) $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) @@ -49,6 +50,13 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/tracer/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -75,6 +83,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) diff --git a/tracer/template/Makefile.am b/tracer/template/Makefile.am new file mode 100644 index 0000000..09e4f09 --- /dev/null +++ b/tracer/template/Makefile.am @@ -0,0 +1,25 @@ +# file : tracer/template/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +noinst_PROGRAMS = driver +driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) + +TESTS=$(top_builddir)/tester +TESTS_ENVIRONMENT=top_builddir=$(top_builddir); + +m4_ifelse(__value__(odb_options),,, + +# ODB compilation. +# +driver_SOURCES += test.hxx test-odb.cxx +BUILT_SOURCES = test-odb.hxx +CLEANFILES = test-odb.hxx test-odb.ixx test-odb.cxx + +ODB = @ODB@ +ODBFLAGS = @ODBFLAGS@ + +test-odb.hxx: test.hxx + $(ODB) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< +) diff --git a/tracer/template/driver.cxx b/tracer/template/driver.cxx new file mode 100644 index 0000000..c727fac --- /dev/null +++ b/tracer/template/driver.cxx @@ -0,0 +1,35 @@ +// file : tracer/template/driver.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// PLACE TEST DESCRIPTION HERE +// + +#include +#include +#include + +#include +#include +#include + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; +using namespace odb; + +int +main () +{ + tracer::database db; + + // + // + cout << "test 001" << endl; + { + transaction t (db.begin_transaction ()); + t.commit (); + } +} diff --git a/tracer/template/makefile b/tracer/template/makefile new file mode 100644 index 0000000..b7b82b7 --- /dev/null +++ b/tracer/template/makefile @@ -0,0 +1,92 @@ +# file : tracer/template/makefile +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make + +cxx_tun := driver.cxx +odb_hdr := test.hxx +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) +cxx_od := $(cxx_obj:.o=.o.d) + +driver := $(out_base)/driver +dist := $(out_base)/.dist +test := $(out_base)/.test +clean := $(out_base)/.clean + +# Import. +# +$(call import,\ + $(scf_root)/import/odb/stub.make,\ + odb: odb,odb-rules: odb_rules) + +$(call import,\ + $(scf_root)/import/libodb/stub.make,\ + l: odb.l,cpp-options: odb.l.cpp-options) + +$(call import,\ + $(scf_root)/import/libodb-tracer/stub.make,\ + l: odb_tracer.l,cpp-options: odb_tracer.l.cpp-options) + +# Build. +# +$(driver): $(cxx_obj) $(odb_tracer.l) $(odb.l) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) + +genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen) $(dist): export odb_options += --database tracer +$(gen): cpp_options := -I$(out_base) +$(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) + +$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) + +# Alias for default target. +# +$(out_base)/: $(driver) + +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake) + +# Test. +# +$(test): $(driver) $(src_base)/test.std + $(call message,test $<,$< | diff -u $(src_base)/test.std -) + +# Clean. +# +$(clean): \ + $(driver).o.clean \ + $(addsuffix .cxx.clean,$(cxx_obj)) \ + $(addsuffix .cxx.clean,$(cxx_od)) \ + $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean)) + +# 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/automake.make) + +$(call include,$(odb_rules)) +$(call include,$(bld_root)/cxx/cxx-d.make) +$(call include,$(bld_root)/cxx/cxx-o.make) +$(call include,$(bld_root)/cxx/o-e.make) diff --git a/tracer/template/test.hxx b/tracer/template/test.hxx new file mode 100644 index 0000000..06d7155 --- /dev/null +++ b/tracer/template/test.hxx @@ -0,0 +1,27 @@ +// file : tracer/template/test.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TEST_HXX +#define TEST_HXX + +#include + +#pragma odb object +struct object +{ + object (unsigned long id) + : id_ (id) + { + } + + object () + { + } + + #pragma odb id + unsigned long id_; +}; + +#endif // TEST_HXX diff --git a/tracer/template/test.std b/tracer/template/test.std new file mode 100644 index 0000000..ac654fc --- /dev/null +++ b/tracer/template/test.std @@ -0,0 +1,3 @@ +test 001 +begin transaction +commit transaction diff --git a/tracer/transaction/makefile b/tracer/transaction/makefile index 5919e6e..fd1d698 100644 --- a/tracer/transaction/makefile +++ b/tracer/transaction/makefile @@ -10,6 +10,7 @@ cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) cxx_od := $(cxx_obj:.o=.o.d) driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -35,6 +36,13 @@ $(call include-dep,$(cxx_od)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/tracer/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -60,6 +68,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/o-e.make) diff --git a/tracer/types/makefile b/tracer/types/makefile index 382d1b5..f042476 100644 --- a/tracer/types/makefile +++ b/tracer/types/makefile @@ -11,6 +11,7 @@ cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) cxx_od := $(cxx_obj:.o=.o.d) driver := $(out_base)/driver +dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean @@ -39,7 +40,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen): odb_options += --database tracer +$(gen) $(dist): export odb_options += --database tracer $(gen): cpp_options := -I$(out_base) $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options) @@ -49,6 +50,13 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # $(out_base)/: $(driver) +# Dist +# +$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std +$(dist): + $(call dist-data,$(data_dist)) + $(call meta-automake,$(src_root)/tracer/template/Makefile.am) + # Test. # $(test): $(driver) $(src_base)/test.std @@ -75,6 +83,9 @@ endif # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(odb_rules)) $(call include,$(bld_root)/cxx/cxx-d.make) $(call include,$(bld_root)/cxx/cxx-o.make) -- cgit v1.1