diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:50:24 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:50:24 +0200 |
commit | 289a99b42a16d69e9f97cef705669e04a3217581 (patch) | |
tree | 131301ca74003dce0c3e7bdea4d69cf53d0a3835 /odb | |
parent | 2fe6da790e143e082bb512502b8d92c1f19ee870 (diff) |
Support for automake and VC++ builds
Diffstat (limited to 'odb')
-rw-r--r-- | odb/tracer/Makefile.am | 15 | ||||
-rw-r--r-- | odb/tracer/database.hxx | 8 | ||||
-rw-r--r-- | odb/tracer/details/export.hxx | 27 | ||||
-rw-r--r-- | odb/tracer/exceptions.hxx | 8 | ||||
-rw-r--r-- | odb/tracer/libodb-tracer-vc10.vcxproj | 174 | ||||
-rw-r--r-- | odb/tracer/libodb-tracer-vc10.vcxproj.filters | 19 | ||||
-rw-r--r-- | odb/tracer/libodb-tracer-vc9.vcproj | 359 | ||||
-rw-r--r-- | odb/tracer/makefile | 38 | ||||
-rw-r--r-- | odb/tracer/transaction-impl.hxx | 8 | ||||
-rw-r--r-- | odb/tracer/transaction.hxx | 8 | ||||
-rw-r--r-- | odb/tracer/version.hxx | 4 |
11 files changed, 653 insertions, 15 deletions
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 <boris@codesynthesis.com> +# 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 <odb/pre.hxx> + #include <odb/database.hxx> #include <odb/tracer/transaction-impl.hxx> +#include <odb/tracer/details/export.hxx> + 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 <odb/post.hxx> + #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 <boris@codesynthesis.com> +// 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 <odb/pre.hxx> + +#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 <odb/post.hxx> + +#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 <odb/pre.hxx> + #include <string> #include <odb/exceptions.hxx> +#include <odb/tracer/details/export.hxx> + 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 <odb/post.hxx> + #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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B36347CF-990B-4051-ABCF-2D0102AB9DC6}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libodb-tracer</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\</OutDir> + <TargetName>odb-tracer-d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin64\</OutDir> + <TargetName>odb-tracer-d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\</OutDir> + <TargetName>odb-tracer-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin64\</OutDir> + <TargetName>odb-tracer-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib\odb-tracer-d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib64\odb-tracer-d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib\odb-tracer.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib64\odb-tracer.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +__header_entries__(headers) + </ItemGroup> + <ItemGroup> +__source_entries__(sources) + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{E6F5CEBC-D348-41FE-89FB-68EC604EB9C6}</UniqueIdentifier> + <Extensions>cxx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{D048FD24-DAC3-4438-AC23-9A780AD19D58}</UniqueIdentifier> + <Extensions>h;hxx;ixx;txx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> +__header_filter_entries__(headers) + </ItemGroup> + <ItemGroup> +__source_filter_entries__(sources) + </ItemGroup> +</Project> 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 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libodb-tracer" + ProjectGUID="{91A7F956-C683-475D-B570-72380D2557ED}" + RootNamespace="libodb-tracer" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="..\.." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib mkdir ..\..\lib" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb-d.lib" + OutputFile="$(OutDir)\bin\odb-tracer-d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib\odb-tracer-d.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="..\.." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb-d.lib" + OutputFile="$(OutDir)\bin64\odb-tracer-d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib64\odb-tracer-d.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="..\.." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib mkdir ..\..\lib" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb.lib" + OutputFile="$(OutDir)\bin\odb-tracer-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib\odb-tracer.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="..\.." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_TRACER_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb.lib" + OutputFile="$(OutDir)\bin64\odb-tracer-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib64\odb-tracer.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cxx" + UniqueIdentifier="{14E14436-8C04-45A1-90FC-C47F4F060402}" + > +__source_entries__(sources) + </Filter> + <Filter + Name="Header Files" + Filter="h;hxx;ixx;txx" + UniqueIdentifier="{C808A763-FA42-4F31-824C-3B809E3FE529}" + > +__file_entries__(headers) + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> 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 <odb/pre.hxx> + #include <odb/transaction.hxx> +#include <odb/tracer/details/export.hxx> + 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 <odb/post.hxx> + #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 <odb/pre.hxx> + #include <odb/transaction.hxx> +#include <odb/tracer/details/export.hxx> + 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 <odb/tracer/transaction.ixx> +#include <odb/post.hxx> + #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 <odb/pre.hxx> + #include <odb/version.hxx> // Version format is AABBCCDD where @@ -37,4 +39,6 @@ #define LIBODB_TRACER_VERSION 999901 #define LIBODB_TRACER_VERSION_STR "1.0.0.a1" +#include <odb/post.hxx> + #endif // ODB_TRACER_VERSION_HXX |