activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r649229 - in /activemq/activemq-cpp/trunk/vs2005-build: vs2005-activemq-example.vcproj vs2005-activemq-integration-tests.vcproj vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj
Date Thu, 17 Apr 2008 18:51:28 GMT
Author: tabish
Date: Thu Apr 17 11:51:26 2008
New Revision: 649229

URL: http://svn.apache.org/viewvc?rev=649229&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=649229&r1=649228&r2=649229&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj Thu Apr 17 11:51:26
2008
@@ -304,8 +304,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft
Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program
Files\APR\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL"
+				AdditionalIncludeDirectories="..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft
Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program
Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -329,10 +329,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib decafd.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program
Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\DebugDLL&quot;;&quot;C:\Program
Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;"
 				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=649229&r1=649228&r2=649229&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 Thu
Apr 17 11:51:26 2008
@@ -151,11 +151,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libdecaf.lib libapr-1.lib libaprutil-1.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\Decaf\vs2005-build\Release&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program
Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -303,7 +303,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program
Files\APR\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -327,9 +327,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib decafd.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program
Files\Decaf\vs2005-build\DebugDLL&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"

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=649229&r1=649228&r2=649229&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Thu Apr 17 11:51:26
2008
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
+				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program
Files\Decaf\src\main&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -151,10 +151,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libdecaf.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\Decaf\vs2005-build\Release&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program
Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -303,8 +303,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\APR\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL"
+				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -328,10 +328,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib decafd.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\Decaf\vs2005-build\DebugDLL&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program
Files\APR\lib&quot;"
 				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=649229&r1=649228&r2=649229&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Thu Apr 17 11:51:26 2008
@@ -287,8 +287,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib decafd.lib"
 				OutputFile="$(OutDir)\activemq-cppd.dll"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program
Files\Decaf\vs2005-build\DebugDLL&quot;"
 				GenerateDebugInformation="true"
 			/>
 			<Tool
@@ -4606,46 +4607,6 @@
 					RelativePath="..\src\main\activemq\exceptions\ExceptionDefines.h"
 					>
 				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\IllegalArgumentException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\IllegalMonitorStateException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\IllegalStateException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\IndexOutOfBoundsException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\InterruptedException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\InvalidStateException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\NoSuchElementException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\NullPointerException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\RuntimeException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\src\main\activemq\exceptions\UnsupportedOperationException.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="io"
@@ -4870,6 +4831,10 @@
 			<Filter
 				Name="cmsutil"
 				>
+				<File
+					RelativePath="..\src\main\activemq\cmsutil\CachedConsumer.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\main\activemq\cmsutil\CachedProducer.h"
 					>



Mime
View raw message