You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/04/22 21:21:39 UTC
svn commit: r767627 [1/2] - in
/activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build:
vs2005-activemq-integration-tests.vcproj vs2005-activemq-unittests.vcproj
Author: tabish
Date: Wed Apr 22 19:21:39 2009
New Revision: 767627
URL: http://svn.apache.org/viewvc?rev=767627&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-238
Modified:
activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-integration-tests.vcproj
activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-unittests.vcproj
Modified: activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-integration-tests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-integration-tests.vcproj?rev=767627&r1=767626&r2=767627&view=diff
==============================================================================
--- activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-integration-tests.vcproj (original)
+++ activemq/activemq-cpp/branches/activemq-cpp-2.x/vs2005-build/vs2005-activemq-integration-tests.vcproj Wed Apr 22 19:21:39 2009
@@ -107,12 +107,12 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
+ CharacterSet="0"
+ ManagedExtensions="0"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -129,19 +129,24 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
- WarningLevel="2"
+ WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4290, 4101"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -154,15 +159,13 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
- LinkIncremental="1"
+ AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -193,7 +196,7 @@
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|Win32"
+ Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
@@ -219,7 +222,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -240,11 +243,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
+ AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -279,12 +282,12 @@
/>
</Configuration>
<Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="0"
- ManagedExtensions="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -301,23 +304,20 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4290, 4101"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -330,13 +330,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
- LinkIncremental="2"
+ AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
SubSystem="1"
- TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -367,12 +369,12 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="ReleaseDLL|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="0"
- ManagedExtensions="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -389,24 +391,19 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- DisableSpecificWarnings="4290, 4101"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -419,13 +416,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
- LinkIncremental="2"
+ AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -456,7 +455,7 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="ReleaseDLL|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -483,7 +482,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -504,11 +503,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
+ AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -543,12 +542,12 @@
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|x64"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="DebugDLL|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
+ CharacterSet="0"
+ ManagedExtensions="0"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -565,20 +564,23 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)/include";"$(APR_DIST)/include";../src/main;"..\src\test-integration""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
- WarningLevel="2"
+ WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4290, 4101"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -591,15 +593,13 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
- LinkIncremental="1"
+ AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""$(APR_DIST)\bin";"$(APR_DIST)\lib";"$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -1005,6 +1005,22 @@
</File>
</Filter>
</Filter>
+ <Filter
+ Name="util"
+ >
+ <Filter
+ Name="teamcity"
+ >
+ <File
+ RelativePath="..\src\test-integration\util\teamcity\TeamCityProgressListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\test-integration\util\teamcity\TeamCityProgressListener.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Filter>
</Files>
<Globals>