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/02/02 00:07:27 UTC
svn commit: r617697 - in /activemq/activemq-cpp/trunk/vs2005-build:
vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj
Author: tabish
Date: Fri Feb 1 15:07:23 2008
New Revision: 617697
URL: http://svn.apache.org/viewvc?rev=617697&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Working on the Windows Build
Modified:
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-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?rev=617697&r1=617696&r2=617697&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Fri Feb 1 15:07:23 2008
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\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:\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""
PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -66,10 +66,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib"
+ 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\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:\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""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
@@ -373,42 +373,6 @@
Name="activemq"
>
<Filter
- Name="concurrent"
- >
- <File
- RelativePath="..\src\test\activemq\concurrent\CountDownLatchTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\CountDownLatchTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\MutexTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\MutexTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\ThreadPoolTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\ThreadPoolTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\ThreadTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\concurrent\ThreadTest.h"
- >
- </File>
- </Filter>
- <Filter
Name="connector"
>
<File
@@ -3445,90 +3409,6 @@
</File>
</Filter>
<Filter
- Name="io"
- >
- <File
- RelativePath="..\src\test\activemq\io\BufferedInputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\BufferedInputStreamTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\BufferedOutputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\BufferedOutputStreamTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\ByteArrayInputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\ByteArrayInputStreamTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\ByteArrayOutputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\ByteArrayOutputStreamTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\DataInputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\DataInputStreamTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\DataOutputStreamTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\io\DataOutputStreamTest.h"
- >
- </File>
- </Filter>
- <Filter
- Name="logger"
- >
- <File
- RelativePath="..\src\test\activemq\logger\LoggerTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\logger\LoggerTest.h"
- >
- </File>
- </Filter>
- <Filter
- Name="network"
- >
- <File
- RelativePath="..\src\test\activemq\network\SocketFactoryTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\network\SocketFactoryTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\network\SocketTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\network\SocketTest.h"
- >
- </File>
- </Filter>
- <Filter
Name="transport"
>
<File
@@ -3572,59 +3452,11 @@
Name="util"
>
<File
- RelativePath="..\src\test\activemq\util\BooleanTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\BooleanTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\DateTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\DateTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\Endian.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\Endian.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\GuidTest.cpp"
+ RelativePath="..\src\test\activemq\util\LongSequenceGeneratorTest.cpp"
>
</File>
<File
- RelativePath="..\src\test\activemq\util\GuidTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\IntegerTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\IntegerTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\LongTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\LongTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\MapTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\MapTest.h"
+ RelativePath="..\src\test\activemq\util\LongSequenceGeneratorTest.h"
>
</File>
<File
@@ -3633,30 +3465,6 @@
</File>
<File
RelativePath="..\src\test\activemq\util\PrimitiveMapTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\QueueTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\QueueTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\RandomTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\RandomTest.h"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\StringTokenizerTest.cpp"
- >
- </File>
- <File
- RelativePath="..\src\test\activemq\util\StringTokenizerTest.h"
>
</File>
<File
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=617697&r1=617696&r2=617697&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Fri Feb 1 15:07:23 2008
@@ -42,7 +42,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=""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""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;$(NOINHERIT)"
KeepComments="false"
MinimalRebuild="false"
@@ -427,11 +427,7 @@
Name="util"
>
<File
- RelativePath="..\src\main\activemq\util\Boolean.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Character.h"
+ RelativePath="..\src\main\activemq\util\ActiveMQProperties.h"
>
</File>
<File
@@ -439,30 +435,6 @@
>
</File>
<File
- RelativePath="..\src\main\activemq\util\Date.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Date.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Guid.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Guid.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Integer.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Long.h"
- >
- </File>
- <File
RelativePath="..\src\main\activemq\util\LongSequenceGenerator.cpp"
>
</File>
@@ -471,22 +443,6 @@
>
</File>
<File
- RelativePath="..\src\main\activemq\util\Map.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Math.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Math.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Number.h"
- >
- </File>
- <File
RelativePath="..\src\main\activemq\util\PrimitiveMap.cpp"
>
</File>
@@ -495,34 +451,6 @@
>
</File>
<File
- RelativePath="..\src\main\activemq\util\Properties.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Queue.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Random.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Random.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\Set.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\StringTokenizer.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\util\StringTokenizer.h"
- >
- </File>
- <File
RelativePath="..\src\main\activemq\util\URISupport.cpp"
>
</File>
@@ -532,74 +460,6 @@
</File>
</Filter>
<Filter
- Name="concurrent"
- >
- <File
- RelativePath="..\src\main\activemq\concurrent\Concurrent.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\CountDownLatch.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\CountDownLatch.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Lock.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Mutex.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Mutex.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\PooledThread.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\PooledThread.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\PooledThreadListener.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Runnable.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Synchronizable.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\TaskListener.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Thread.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\Thread.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\ThreadPool.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\concurrent\ThreadPool.h"
- >
- </File>
- </Filter>
- <Filter
Name="connector"
>
<File
@@ -4791,82 +4651,6 @@
Name="io"
>
<File
- RelativePath="..\src\main\activemq\io\BlockingByteArrayInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\BlockingByteArrayInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\BufferedInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\BufferedInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\BufferedOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\BufferedOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\ByteArrayInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\ByteArrayInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\ByteArrayOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\ByteArrayOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\DataInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\DataInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\DataOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\DataOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\EOFException.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\FilterInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\FilterOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\InputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\IOException.h"
- >
- </File>
- <File
RelativePath="..\src\main\activemq\io\LoggingInputStream.cpp"
>
</File>
@@ -4880,178 +4664,6 @@
</File>
<File
RelativePath="..\src\main\activemq\io\LoggingOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\OutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\Reader.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\StandardErrorOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\io\Writer.h"
- >
- </File>
- </Filter>
- <Filter
- Name="logger"
- >
- <File
- RelativePath="..\src\main\activemq\logger\ConsoleHandler.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\Filter.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\Formatter.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\Handler.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\Logger.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\Logger.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LoggerCommon.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LoggerDefines.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LoggerHierarchy.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LoggerHierarchy.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LogManager.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LogManager.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LogRecord.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LogWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\LogWriter.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\MarkBlockLogger.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\PropertiesChangeListener.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\SimpleFormatter.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\SimpleLogger.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\SimpleLogger.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\logger\StreamHandler.h"
- >
- </File>
- </Filter>
- <Filter
- Name="network"
- >
- <File
- RelativePath="..\src\main\activemq\network\BufferedSocket.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\BufferedSocket.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\ServerSocket.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\ServerSocket.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\Socket.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketError.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketError.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketException.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketFactory.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketInputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketInputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketOutputStream.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\SocketOutputStream.h"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\TcpSocket.cpp"
- >
- </File>
- <File
- RelativePath="..\src\main\activemq\network\TcpSocket.h"
>
</File>
</Filter>