diff options
45 files changed, 114 insertions, 114 deletions
diff --git a/boost/build.bat b/boost/build.bat index 4e4536c..eb43d41 100644 --- a/boost/build.bat +++ b/boost/build.bat @@ -59,14 +59,14 @@ goto :eof for %%d in (%1) do ( for %%c in (%confs%) do ( for %%p in (%plats%) do ( - call :run_build %%d/%%d-vc%vcver%.sln %%c %%p + call :run_build %%d/boost-%%d-vc%vcver%.sln %%c %%p ) ) ) for %%c in (%confs%) do ( for %%p in (%plats%) do ( - call :run_build common/common-%1-vc%vcver%.sln %%c %%p + call :run_build common/boost-common-%1-vc%vcver%.sln %%c %%p ) ) diff --git a/boost/common/common-vc10.sln b/boost/common/boost-common-vc10.sln index 9a5dc32..9a5dc32 100644 --- a/boost/common/common-vc10.sln +++ b/boost/common/boost-common-vc10.sln diff --git a/boost/common/common-vc9.sln b/boost/common/boost-common-vc9.sln index 2ec9432..2ec9432 100644 --- a/boost/common/common-vc9.sln +++ b/boost/common/boost-common-vc9.sln diff --git a/boost/common/makefile b/boost/common/makefile index eeb083e..4af0162 100644 --- a/boost/common/makefile +++ b/boost/common/makefile @@ -18,7 +18,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) -name := $(notdir $(src_base)) +name := boost-common $(dist): name := $(name) $(dist): export dirs := $(tests) $(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ diff --git a/boost/common/template/makefile b/boost/common/template/makefile index d22654e..1a97660 100644 --- a/boost/common/template/makefile +++ b/boost/common/template/makefile @@ -58,7 +58,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/boost/common/template/template-vc10.vcxproj b/boost/common/template/template-vc10.vcxproj index 44c2813..e3c66a6 100644 --- a/boost/common/template/template-vc10.vcxproj +++ b/boost/common/template/template-vc10.vcxproj @@ -89,11 +89,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -105,11 +105,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -123,11 +123,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -143,11 +143,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -158,7 +158,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup> <ItemGroup> diff --git a/boost/common/template/template-vc9.vcproj b/boost/common/template/template-vc9.vcproj index e024770..b22262b 100644 --- a/boost/common/template/template-vc9.vcproj +++ b/boost/common/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -141,7 +141,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib\common.lib odb-__value__(database).lib odb-boost.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common.lib odb-__value__(database).lib odb-boost.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -219,7 +219,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -296,7 +296,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb-boost.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb-boost.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -348,7 +348,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx) diff --git a/boost/makefile b/boost/makefile index 8ab4602..a73ace3 100644 --- a/boost/makefile +++ b/boost/makefile @@ -21,7 +21,7 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export extra_dist := build.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_dirs))) - $(call meta-vctest,common/common-mysql-vc10.sln,build.bat) + $(call meta-vctest,common/boost-common-mysql-vc10.sln,build.bat) $(call meta-automake) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs))) diff --git a/boost/mysql/mysql-vc10.sln b/boost/mysql/boost-mysql-vc10.sln index 9a5dc32..9a5dc32 100644 --- a/boost/mysql/mysql-vc10.sln +++ b/boost/mysql/boost-mysql-vc10.sln diff --git a/boost/mysql/mysql-vc9.sln b/boost/mysql/boost-mysql-vc9.sln index 2ec9432..2ec9432 100644 --- a/boost/mysql/mysql-vc9.sln +++ b/boost/mysql/boost-mysql-vc9.sln diff --git a/boost/mysql/makefile b/boost/mysql/makefile index 0d3b7b4..44853a6 100644 --- a/boost/mysql/makefile +++ b/boost/mysql/makefile @@ -15,7 +15,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(dist): name := $(notdir $(src_base)) +$(dist): name := boost-mysql $(dist): export dirs := $(tests) $(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) diff --git a/boost/mysql/template/makefile b/boost/mysql/template/makefile index 5abc8bc..2ad3a00 100644 --- a/boost/mysql/template/makefile +++ b/boost/mysql/template/makefile @@ -61,7 +61,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/boost/mysql/template/template-vc10.vcxproj b/boost/mysql/template/template-vc10.vcxproj index 53f73ab..6003968 100644 --- a/boost/mysql/template/template-vc10.vcxproj +++ b/boost/mysql/template/template-vc10.vcxproj @@ -89,11 +89,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -105,11 +105,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -123,11 +123,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -143,11 +143,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\..\libcommon\lib64\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup>) <ItemGroup> diff --git a/boost/mysql/template/template-vc9.vcproj b/boost/mysql/template/template-vc9.vcproj index 9d446a2..0e8314b 100644 --- a/boost/mysql/template/template-vc9.vcproj +++ b/boost/mysql/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib\common-d.lib odb-mysql-d.lib odb-boost-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common-d.lib odb-mysql-d.lib odb-boost-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -141,7 +141,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib\common.lib odb-mysql.lib odb-boost.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common.lib odb-mysql.lib odb-boost.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -219,7 +219,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib64\common-d.lib odb-mysql-d.lib odb-boost-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common-d.lib odb-mysql-d.lib odb-boost-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -296,7 +296,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\..\libcommon\lib64\common.lib odb-mysql.lib odb-boost.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common.lib odb-mysql.lib odb-boost.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) diff --git a/common/auto/makefile b/common/auto/makefile index 896b19f..64e7d50 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/composite/makefile b/common/composite/makefile index 48a1a17..1ffb7c4 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/const/makefile b/common/const/makefile index aeb4bdb..0314fbe 100644 --- a/common/const/makefile +++ b/common/const/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/container/makefile b/common/container/makefile index fe97426..2a95b15 100644 --- a/common/container/makefile +++ b/common/container/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/ctor/makefile b/common/ctor/makefile index 9949e59..9eb8097 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/inverse/makefile b/common/inverse/makefile index 4025fee..d0185ad 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index 8097d52..f8c46af 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile index a6dd68b..346a6cd 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/makefile b/common/makefile index 5a9b9cd..c3f02bf 100644 --- a/common/makefile +++ b/common/makefile @@ -31,7 +31,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) -name := $(notdir $(src_base)) +name := common $(dist): name := $(name) $(dist): export dirs := $(tests) $(dist): export thread_dirs := $(thread_tests) diff --git a/common/query/makefile b/common/query/makefile index 440a173..2866b92 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/relationship/makefile b/common/relationship/makefile index 94d70b8..6b07c17 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/schema/makefile b/common/schema/makefile index ae36fa4..9e6f616 100644 --- a/common/schema/makefile +++ b/common/schema/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/template/makefile b/common/template/makefile index b4c20fc..35da3c2 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -47,7 +47,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/common/template/template-vc10.vcxproj b/common/template/template-vc10.vcxproj index e49d337..b068c05 100644 --- a/common/template/template-vc10.vcxproj +++ b/common/template/template-vc10.vcxproj @@ -89,11 +89,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -105,11 +105,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -123,11 +123,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -143,11 +143,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -158,7 +158,7 @@ __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup> <ItemGroup> diff --git a/common/template/template-vc9.vcproj b/common/template/template-vc9.vcproj index d6dbd3b..cd79624 100644 --- a/common/template/template-vc9.vcproj +++ b/common/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -141,7 +141,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib\common.lib odb-__value__(database).lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common.lib odb-__value__(database).lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -219,7 +219,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -296,7 +296,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common.lib odb-__value__(database).lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -348,7 +348,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx) diff --git a/common/threads/makefile b/common/threads/makefile index 5ff53e8..44c2a06 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -48,7 +48,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/mysql/makefile b/mysql/makefile index 05400dc..a5c512e 100644 --- a/mysql/makefile +++ b/mysql/makefile @@ -18,7 +18,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(dist): name := $(notdir $(src_base)) +$(dist): name := mysql $(dist): export dirs := $(tests) $(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) diff --git a/mysql/native/makefile b/mysql/native/makefile index c7c3fea..035f72f 100644 --- a/mysql/native/makefile +++ b/mysql/native/makefile @@ -33,7 +33,7 @@ $(out_base)/: $(driver) # $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/mysql/template/makefile b/mysql/template/makefile index 6362ab2..a492917 100644 --- a/mysql/template/makefile +++ b/mysql/template/makefile @@ -50,7 +50,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/mysql/template/template-vc10.vcxproj b/mysql/template/template-vc10.vcxproj index a39d43a..0619da6 100644 --- a/mysql/template/template-vc10.vcxproj +++ b/mysql/template/template-vc10.vcxproj @@ -89,11 +89,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -105,11 +105,11 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> @@ -123,11 +123,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib\common.lib;odb-mysql.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib\common.lib;odb-mysql.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -143,11 +143,11 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>..\..\libcommon\lib64\common.lib;odb-mysql.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>$(SolutionDir)\..\libcommon\lib64\common.lib;odb-mysql.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup>) <ItemGroup> diff --git a/mysql/template/template-vc9.vcproj b/mysql/template/template-vc9.vcproj index ac0810a..a9b8038 100644 --- a/mysql/template/template-vc9.vcproj +++ b/mysql/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib\common-d.lib odb-mysql-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common-d.lib odb-mysql-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -141,7 +141,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib\common.lib odb-mysql.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib\common.lib odb-mysql.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -219,7 +219,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib64\common-d.lib odb-mysql-d.lib odb-d.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common-d.lib odb-mysql-d.lib odb-d.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="2" GenerateDebugInformation="true" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -296,7 +296,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="..\..\libcommon\lib64\common.lib odb-mysql.lib odb.lib" + AdditionalDependencies="$(SolutionDir)\..\libcommon\lib64\common.lib odb-mysql.lib odb.lib" OutputFile="$(OutDir)\driver.exe" LinkIncremental="1" GenerateDebugInformation="true" @@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) diff --git a/mysql/truncation/makefile b/mysql/truncation/makefile index aa216cd..adb015a 100644 --- a/mysql/truncation/makefile +++ b/mysql/truncation/makefile @@ -51,7 +51,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/mysql/types/makefile b/mysql/types/makefile index 4d61eef..ed3674f 100644 --- a/mysql/types/makefile +++ b/mysql/types/makefile @@ -53,7 +53,7 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export extra_headers := traits.hxx $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/makefile b/tracer/makefile index a549440..e566c59 100644 --- a/tracer/makefile +++ b/tracer/makefile @@ -20,7 +20,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(dist): name := $(notdir $(src_base)) +$(dist): name := tracer $(dist): export dirs := $(filter-out include,$(tests)) $(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) diff --git a/tracer/object/makefile b/tracer/object/makefile index 428743d..9c4ef1f 100644 --- a/tracer/object/makefile +++ b/tracer/object/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/pragma/makefile b/tracer/pragma/makefile index caf5cd4..5ae74ef 100644 --- a/tracer/pragma/makefile +++ b/tracer/pragma/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/template/makefile b/tracer/template/makefile index 0e5c780..ce99eb2 100644 --- a/tracer/template/makefile +++ b/tracer/template/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/template/template-vc10.vcxproj b/tracer/template/template-vc10.vcxproj index d2e5ae0..523fb79 100644 --- a/tracer/template/template-vc10.vcxproj +++ b/tracer/template/template-vc10.vcxproj @@ -89,7 +89,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> @@ -105,7 +105,7 @@ <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> @@ -123,7 +123,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> @@ -143,7 +143,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\libcommon</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)\..\libcommon</AdditionalIncludeDirectories> <DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup>) <ItemGroup> diff --git a/tracer/template/template-vc9.vcproj b/tracer/template/template-vc9.vcproj index 73649a4..da08589 100644 --- a/tracer/template/template-vc9.vcproj +++ b/tracer/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) diff --git a/tracer/transaction/makefile b/tracer/transaction/makefile index 98d24b7..3979cf3 100644 --- a/tracer/transaction/makefile +++ b/tracer/transaction/makefile @@ -40,7 +40,7 @@ $(out_base)/: $(driver) # $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/types/makefile b/tracer/types/makefile index c2da4c8..ee24b4d 100644 --- a/tracer/types/makefile +++ b/tracer/types/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): |