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 2008/04/16 21:35:47 UTC
svn commit: r648807 - in /activemq/activemq-cpp/trunk/vs2005-build:
vs2005-activemq-example.vcproj vs2005-activemq-integration-tests.vcproj
vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj
Author: tabish
Date: Wed Apr 16 12:35:36 2008
New Revision: 648807
URL: http://svn.apache.org/viewvc?rev=648807&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-103
Updating AMQ-CPP to build with Decaf on windows.
Modified:
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj?rev=648807&r1=648806&r2=648807&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj Wed Apr 16 12:35:36 2008
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Eclipse\ActiveMQ\decaf-trunk\src\main";..\src\examples;..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main";..\src\examples;..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
AdditionalDependencies="ws2_32.lib rpcrt4.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\Eclipse\ActiveMQ\decaf-trunk\vs2005-build\Debug";"C:\Program Files\APR\bin";"C:\Program Files\APR\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\Decaf\vs2005-build\Debug";"C:\Program Files\APR\bin";"C:\Program Files\APR\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj?rev=648807&r1=648806&r2=648807&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj Wed Apr 16 12:35:36 2008
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Eclipse\ActiveMQ\decaf-trunk\src\main";"..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main";"..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\Program Files\APR\lib";"C:\Program Files\APR\bin";"C:\Eclipse\ActiveMQ\decaf-trunk\vs2005-build\Debug";"C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\APR\lib";"C:\Program Files\APR\bin";"C:\Program Files\Decaf\vs2005-build\Debug";"C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
@@ -129,7 +129,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -215,7 +215,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -302,7 +302,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -412,6 +412,14 @@
>
</File>
<File
+ RelativePath="..\src\test-integration\integration\connector\stomp\CmsTemplateTest.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\test-integration\integration\connector\stomp\CmsTemplateTest.h"
+ >
+ </File>
+ <File
RelativePath="..\src\test-integration\integration\connector\stomp\DurableTest.cpp"
>
</File>
@@ -469,6 +477,14 @@
</File>
<File
RelativePath="..\src\test-integration\integration\connector\openwire\OpenwireAsyncSenderTest.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\test-integration\integration\connector\openwire\OpenwireCmsTemplateTest.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\test-integration\integration\connector\openwire\OpenwireCmsTemplateTest.h"
>
</File>
<File
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?rev=648807&r1=648806&r2=648807&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Wed Apr 16 12:35:36 2008
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Eclipse\ActiveMQ\decaf-trunk\src\main";..\src\test;..\src\main;"C:\Program Files\CPPUnit\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include""
+ AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main";..\src\test;..\src\main;"C:\Program Files\CPPUnit\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""C:\Program Files\APR\lib";"C:\Program Files\APR\bin";"C:\Eclipse\ActiveMQ\decaf-trunk\vs2005-build\Debug";"C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\APR\lib";"C:\Program Files\APR\bin";"C:\Program Files\Decaf\vs2005-build\Debug";"C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj?rev=648807&r1=648806&r2=648807&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Wed Apr 16 12:35:36 2008
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Eclipse\ActiveMQ\decaf-trunk\src\main";..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories=""C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main";..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;$(NOINHERIT)"
KeepComments="false"
MinimalRebuild="false"
@@ -114,7 +114,7 @@
<Tool
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
- AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main";"C:\Program Files\APR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;$(NOINHERIT)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -181,7 +181,7 @@
<Tool
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
- AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main";"C:\Program Files\APR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;$(NOINHERIT)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -260,7 +260,7 @@
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
- AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include""
+ AdditionalIncludeDirectories="..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main";"C:\Program Files\APR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;$(NOINHERIT)"
KeepComments="false"
MinimalRebuild="false"