From 289a99b42a16d69e9f97cef705669e04a3217581 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 30 Aug 2010 15:50:24 +0200 Subject: Support for automake and VC++ builds --- odb/tracer/Makefile.am | 15 ++ odb/tracer/database.hxx | 8 +- odb/tracer/details/export.hxx | 27 ++ odb/tracer/exceptions.hxx | 8 +- odb/tracer/libodb-tracer-vc10.vcxproj | 174 +++++++++++++ odb/tracer/libodb-tracer-vc10.vcxproj.filters | 19 ++ odb/tracer/libodb-tracer-vc9.vcproj | 359 ++++++++++++++++++++++++++ odb/tracer/makefile | 38 ++- odb/tracer/transaction-impl.hxx | 8 +- odb/tracer/transaction.hxx | 8 +- odb/tracer/version.hxx | 4 + 11 files changed, 653 insertions(+), 15 deletions(-) create mode 100644 odb/tracer/Makefile.am create mode 100644 odb/tracer/details/export.hxx create mode 100644 odb/tracer/libodb-tracer-vc10.vcxproj create mode 100644 odb/tracer/libodb-tracer-vc10.vcxproj.filters create mode 100644 odb/tracer/libodb-tracer-vc9.vcproj (limited to 'odb') diff --git a/odb/tracer/Makefile.am b/odb/tracer/Makefile.am new file mode 100644 index 0000000..ee14818 --- /dev/null +++ b/odb/tracer/Makefile.am @@ -0,0 +1,15 @@ +# file : odb/tracer/Makefile.am +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +lib_LTLIBRARIES = libodb-tracer.la +libodb_tracer_la_SOURCES = __path__(sources) + +odbtracerincludedir = $(includedir)/odb/tracer/ +nobase_odbtracerinclude_HEADERS = __path__(headers) + +EXTRA_DIST = __file__(extra_dist) + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +libodb_tracer_la_LDFLAGS = -release __value__(interface_version) diff --git a/odb/tracer/database.hxx b/odb/tracer/database.hxx index 902a292..963eb7a 100644 --- a/odb/tracer/database.hxx +++ b/odb/tracer/database.hxx @@ -6,14 +6,18 @@ #ifndef ODB_TRACER_DATABASE_HXX #define ODB_TRACER_DATABASE_HXX +#include + #include #include +#include + namespace odb { namespace tracer { - class database: public odb::database + class LIBODB_TRACER_EXPORT database: public odb::database { public: virtual @@ -25,4 +29,6 @@ namespace odb } } +#include + #endif // ODB_TRACER_DATABASE_HXX diff --git a/odb/tracer/details/export.hxx b/odb/tracer/details/export.hxx new file mode 100644 index 0000000..152a967 --- /dev/null +++ b/odb/tracer/details/export.hxx @@ -0,0 +1,27 @@ +// file : odb/tracer/details/export.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_TRACER_DETAILS_EXPORT_HXX +#define ODB_TRACER_DETAILS_EXPORT_HXX + +#include + +#ifdef LIBODB_TRACER_STATIC_LIB +# define LIBODB_TRACER_EXPORT +#else +# ifdef _WIN32 +# ifdef LIBODB_TRACER_DYNAMIC_LIB +# define LIBODB_TRACER_EXPORT __declspec(dllexport) +# else +# define LIBODB_TRACER_EXPORT __declspec(dllimport) +# endif +# else +# define LIBODB_TRACER_EXPORT +# endif +#endif + +#include + +#endif // ODB_TRACER_DETAILS_EXPORT_HXX diff --git a/odb/tracer/exceptions.hxx b/odb/tracer/exceptions.hxx index bfe9c49..2ce73d8 100644 --- a/odb/tracer/exceptions.hxx +++ b/odb/tracer/exceptions.hxx @@ -6,15 +6,19 @@ #ifndef ODB_TRACER_EXCEPTIONS_HXX #define ODB_TRACER_EXCEPTIONS_HXX +#include + #include #include +#include + namespace odb { namespace tracer { - struct database_exception: odb::database_exception + struct LIBODB_TRACER_EXPORT database_exception: odb::database_exception { database_exception (const std::string&); ~database_exception () throw (); @@ -28,4 +32,6 @@ namespace odb } } +#include + #endif // ODB_TRACER_EXCEPTIONS_HXX diff --git a/odb/tracer/libodb-tracer-vc10.vcxproj b/odb/tracer/libodb-tracer-vc10.vcxproj new file mode 100644 index 0000000..a567f75 --- /dev/null +++ b/odb/tracer/libodb-tracer-vc10.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B36347CF-990B-4051-ABCF-2D0102AB9DC6} + Win32Proj + libodb-tracer + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\..\bin\ + odb-tracer-d-__value__(interface_version)-vc10 + + + true + ..\..\bin64\ + odb-tracer-d-__value__(interface_version)-vc10 + + + false + ..\..\bin\ + odb-tracer-__value__(interface_version)-vc10 + + + false + ..\..\bin64\ + odb-tracer-__value__(interface_version)-vc10 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + odb-d.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib\odb-tracer-d.lib + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + odb-d.lib;%(AdditionalDependencies) + Windows + true + $(TargetPath) + ..\..\lib64\odb-tracer-d.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + odb.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib\odb-tracer.lib + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions) + ..\.. + 4355;4800;4290;4251;%(DisableSpecificWarnings) + + + odb.lib;%(AdditionalDependencies) + Windows + true + true + true + $(TargetPath) + ..\..\lib64\odb-tracer.lib + + + +__header_entries__(headers) + + +__source_entries__(sources) + + + + + diff --git a/odb/tracer/libodb-tracer-vc10.vcxproj.filters b/odb/tracer/libodb-tracer-vc10.vcxproj.filters new file mode 100644 index 0000000..dde9e66 --- /dev/null +++ b/odb/tracer/libodb-tracer-vc10.vcxproj.filters @@ -0,0 +1,19 @@ + + + + + {E6F5CEBC-D348-41FE-89FB-68EC604EB9C6} + cxx + + + {D048FD24-DAC3-4438-AC23-9A780AD19D58} + h;hxx;ixx;txx + + + +__header_filter_entries__(headers) + + +__source_filter_entries__(sources) + + diff --git a/odb/tracer/libodb-tracer-vc9.vcproj b/odb/tracer/libodb-tracer-vc9.vcproj new file mode 100644 index 0000000..639cef4 --- /dev/null +++ b/odb/tracer/libodb-tracer-vc9.vcproj @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entries__(sources) + + +__file_entries__(headers) + + + + + diff --git a/odb/tracer/makefile b/odb/tracer/makefile index 1ab1487..40a9215 100644 --- a/odb/tracer/makefile +++ b/odb/tracer/makefile @@ -5,16 +5,18 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make -cxx_tun := exceptions.cxx database.cxx transaction.cxx transaction-impl.cxx -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) +cxx := exceptions.cxx database.cxx transaction.cxx transaction-impl.cxx + +cxx_tun := $(cxx) +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) +cxx_od := $(cxx_obj:.o=.o.d) odb_tracer.l := $(out_base)/odb-tracer.l odb_tracer.l.cpp-options := $(out_base)/odb-tracer.l.cpp-options -default := $(out_base)/ -install := $(out_base)/.install -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean # Import. # @@ -36,12 +38,21 @@ $(call include-dep,$(cxx_od)) # $(out_base)/: $(odb_tracer.l) -# Install. +# Dist. # -$(install): $(odb_tracer.l) - $(call install-lib,$<,$(install_lib_dir)/$(ld_lib_prefix)odb-tracer$(ld_lib_suffix)) - $(call install-dir,$(src_base),$(install_inc_dir)/odb/tracer,\ -'(' -name '*.hxx' -o -name '*.ixx' -o -name '*.txx' ')') +$(dist): export sources := $(cxx) +$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export extra_dist := libodb-tracer-vc9.vcproj \ +libodb-tracer-vc10.vcxproj libodb-tracer-vc10.vcxproj.filters +$(dist): export interface_version = $(shell sed -e \ +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) + +$(dist): + $(call dist-data,$(sources) $(headers)) + $(call meta-vc9proj,$(src_base)/libodb-tracer-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-tracer-vc10.vcxproj) + $(call meta-automake) # Clean. # @@ -52,6 +63,11 @@ $(clean): $(odb_tracer.l).o.clean \ # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(bld_root)/cxx/o-l.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/odb/tracer/transaction-impl.hxx b/odb/tracer/transaction-impl.hxx index 92adb04..ec14373 100644 --- a/odb/tracer/transaction-impl.hxx +++ b/odb/tracer/transaction-impl.hxx @@ -6,8 +6,12 @@ #ifndef ODB_TRACER_TRANSACTION_IMPL_HXX #define ODB_TRACER_TRANSACTION_IMPL_HXX +#include + #include +#include + namespace odb { namespace tracer @@ -15,7 +19,7 @@ namespace odb class database; class transaction; - class transaction_impl: public odb::transaction_impl + class LIBODB_TRACER_EXPORT transaction_impl: public odb::transaction_impl { protected: friend class database; @@ -40,4 +44,6 @@ namespace odb } } +#include + #endif // ODB_TRACER_TRANSACTION_IMPL_HXX diff --git a/odb/tracer/transaction.hxx b/odb/tracer/transaction.hxx index 2bcfa07..1273e18 100644 --- a/odb/tracer/transaction.hxx +++ b/odb/tracer/transaction.hxx @@ -6,8 +6,12 @@ #ifndef ODB_TRACER_TRANSACTION_HXX #define ODB_TRACER_TRANSACTION_HXX +#include + #include +#include + namespace odb { namespace tracer @@ -15,7 +19,7 @@ namespace odb class database; class transaction_impl; - class transaction: public odb::transaction + class LIBODB_TRACER_EXPORT transaction: public odb::transaction { public: typedef odb::database database_type; @@ -43,4 +47,6 @@ namespace odb #include +#include + #endif // ODB_TRACER_TRANSACTION_HXX diff --git a/odb/tracer/version.hxx b/odb/tracer/version.hxx index 544f606..2573adf 100644 --- a/odb/tracer/version.hxx +++ b/odb/tracer/version.hxx @@ -6,6 +6,8 @@ #ifndef ODB_TRACER_VERSION_HXX #define ODB_TRACER_VERSION_HXX +#include + #include // Version format is AABBCCDD where @@ -37,4 +39,6 @@ #define LIBODB_TRACER_VERSION 999901 #define LIBODB_TRACER_VERSION_STR "1.0.0.a1" +#include + #endif // ODB_TRACER_VERSION_HXX -- cgit v1.1