Author: tabish
Date: Mon Mar 8 18:47:14 2010
New Revision: 920444
URL: http://svn.apache.org/viewvc?rev=920444&view=rev
Log:
Add missing files to Windows Project
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-integration-tests.vcproj
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-integration-tests.vcproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-integration-tests.vcproj?rev=920444&r1=920443&r2=920444&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-integration-tests.vcproj
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-integration-tests.vcproj
Mon Mar 8 18:47:14 2010
@@ -107,12 +107,12 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
-
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="0"
- ManagedExtensions="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -129,24 +129,19 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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"
+ 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"
@@ -159,13 +154,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunitd.lib
libapr-1.lib libaprutil-1.lib"
- LinkIncremental="2"
+ AdditionalDependencies="ws2_32.lib cppunit.lib
libapr-1.lib libaprutil-1.lib"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -196,7 +193,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="ReleaseDLL|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
@@ -222,7 +219,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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)\"
@@ -243,11 +240,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=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -282,12 +279,12 @@
/>
</Configuration>
<Configuration
- Name="Release|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
@@ -304,20 +301,23 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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;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"
@@ -330,15 +330,13 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib
libapr-1.lib libaprutil-1.lib"
- LinkIncremental="1"
+ AdditionalDependencies="ws2_32.lib cppunitd.lib
apr-1.lib aprutil-1.lib"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -369,12 +367,12 @@
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|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
@@ -391,19 +389,24 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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"
+ 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"
@@ -416,15 +419,13 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunit.lib
apr-1.lib aprutil-1.lib"
- LinkIncremental="1"
+ AdditionalDependencies="ws2_32.lib cppunitd.lib
libapr-1.lib libaprutil-1.lib"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -455,7 +456,7 @@
/>
</Configuration>
<Configuration
- Name="ReleaseDLL|x64"
+ Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -482,7 +483,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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)\"
@@ -503,11 +504,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=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -542,12 +543,12 @@
/>
</Configuration>
<Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="ReleaseDLL|x64"
+
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="0"
- ManagedExtensions="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
>
<Tool
@@ -564,23 +565,20 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""../src/test-integration";..\src\main;"$(PLATFORM_SDK)\include";"$(CPPUNIT_DIST)\include";"$(APR_DIST)\include""
-
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;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="4"
- DisableSpecificWarnings="4290, 4101"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -593,13 +591,15 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib cppunitd.lib
apr-1.lib aprutil-1.lib"
- LinkIncremental="2"
+ AdditionalDependencies="ws2_32.lib cppunit.lib
apr-1.lib aprutil-1.lib"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""$(PLATFORM_SDK)\lib";"$(CPPUNIT_DIST)\lib";"$(APR_DIST)\lib";"$(APR_DIST)\bin""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -784,6 +784,14 @@
>
</File>
<File
+
RelativePath="..\src\test-integration\activemq\test\MessageCompressionTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test-integration\activemq\test\MessageCompressionTest.h"
+ >
+ </File>
+ <File
RelativePath="..\src\test-integration\activemq\test\SimpleRollbackTest.cpp"
>
</File>
@@ -883,6 +891,14 @@
>
</File>
<File
+
RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireMessageCompressionTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireMessageCompressionTest.h"
+ >
+ </File>
+ <File
RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireSimpleRollbackTest.cpp"
>
</File>
