You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/10/09 00:37:09 UTC
svn commit: r823350 - in /qpid/trunk/qpid/wcf: ReadMe.txt
src/Apache/Qpid/Interop/Interop.vcproj
test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
tools/QCreate/QCreate.vcproj
Author: shuston
Date: Thu Oct 8 22:37:09 2009
New Revision: 823350
URL: http://svn.apache.org/viewvc?rev=823350&view=rev
Log:
Apply patch from QPID-2103.
Modified:
qpid/trunk/qpid/wcf/ReadMe.txt
qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj
Modified: qpid/trunk/qpid/wcf/ReadMe.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/ReadMe.txt?rev=823350&r1=823349&r2=823350&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/ReadMe.txt (original)
+++ qpid/trunk/qpid/wcf/ReadMe.txt Thu Oct 8 22:37:09 2009
@@ -49,9 +49,9 @@
qpid source code location e.g. C:\trunk\qpid
5. Build Qpid cpp
-Run CMake and choose "%QPID_ROOT%\cpp\build" as the location for "Where to
-build the binaries". Build at least the "qpidd", "qpidclient" and
-"qpidcommon" projects.
+Build at least the "qpidd", "qpidclient" and "qpidcommon" projects.
+Create an environment variable called QPID_BUILD_ROOT and store the
+path to the Qpid build directory in it.
4. Building the solution file
@@ -81,7 +81,7 @@
%QPID_ROOT%\wcf\test\Apache\Qpid\Test\Channel\Functional\RunTests.bat has the correct
values for the nunit_exe, qpid_dll_location and configuration_name variables as per
your installation.
-2. Start the qpid broker from the qpid build folder e.g. %QPID_ROOT%\cpp\build\src\Debug.
+2. Start the qpid broker from the qpid build folder e.g. %QPID_BUILD_ROOT%\src\Debug.
3. Execute RunTests.bat from its location e.g. %QPID_ROOT%\wcf\test\Apache\Qpid\Test\Channel\Functional.
Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj?rev=823350&r1=823349&r2=823350&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj (original)
+++ qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj Thu Oct 8 22:37:09 2009
@@ -65,7 +65,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/FU Debug\Apache.Qpid.AmqpTypes.netmodule"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\cpp\build\include;..\..\..\..\..\cpp\build\src;..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;"$(BOOST_ROOT)""
+ AdditionalIncludeDirectories=""$(QPID_BUILD_ROOT)\include";"$(QPID_BUILD_ROOT)\src";..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;"$(BOOST_ROOT)""
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_NONSTDC_NO_WARNINGS;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -83,7 +83,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="..\..\..\..\..\cpp\build\src\Debug\qpidcommon.lib ..\..\..\..\..\cpp\build\src\Debug\qpidclient.lib Debug\Apache.Qpid.AmqpTypes.netmodule"
+ AdditionalOptions="$(QPID_BUILD_ROOT)\src\Debug\qpidcommond.lib $(QPID_BUILD_ROOT)\src\Debug\qpidclientd.lib Debug\Apache.Qpid.AmqpTypes.netmodule"
AdditionalDependencies="$(NoInherit)"
OutputFile="$(OutDir)\Apache.Qpid.Interop.dll"
LinkIncremental="2"
Modified: qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat?rev=823350&r1=823349&r2=823350&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat (original)
+++ qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat Thu Oct 8 22:37:09 2009
@@ -19,15 +19,15 @@
set nunit_exe=%programfiles%\NUnit 2.5.1\bin\net-2.0\nunit-console.exe
-set qpid_dll_location=..\..\..\..\..\..\..\cpp\build\src\Debug
+set qpid_dll_location=%QPID_BUILD_ROOT%\src\Debug
set configuration_name=bin\Debug
set qcreate_location=..\..\..\..\..\..\tools\QCreate\Debug
-copy %qpid_dll_location%\qpidclient.dll %configuration_name%
-copy %qpid_dll_location%\qpidcommon.dll %configuration_name%
+copy %qpid_dll_location%\qpidclientd.dll %configuration_name%
+copy %qpid_dll_location%\qpidcommond.dll %configuration_name%
-copy %qpid_dll_location%\qpidclient.dll %qcreate_location%
-copy %qpid_dll_location%\qpidcommon.dll %qcreate_location%
+copy %qpid_dll_location%\qpidclientd.dll %qcreate_location%
+copy %qpid_dll_location%\qpidcommond.dll %qcreate_location%
%qcreate_location%\QCreate.exe amq.direct routing_key message_queue
Modified: qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj?rev=823350&r1=823349&r2=823350&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj (original)
+++ qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj Thu Oct 8 22:37:09 2009
@@ -61,7 +61,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(BOOST_ROOT)\include\$(BOOST_VERSION)";"$(BOOST_ROOT)\.";..\..\..\cpp\include;..\..\..\cpp\build\include"
+ AdditionalIncludeDirectories=""$(BOOST_ROOT)\include\$(BOOST_VERSION)";"$(BOOST_ROOT)\.";..\..\..\cpp\include;"$(QPID_BUILD_ROOT)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -81,9 +81,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qpidcommon.lib qpidclient.lib"
+ AdditionalDependencies="qpidcommond.lib qpidclientd.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories=".;"$(BOOST_ROOT)\lib";..\..\..\cpp\build\src\Debug"
+ AdditionalLibraryDirectories=".;"$(BOOST_ROOT)\lib";"$(QPID_BUILD_ROOT)\src\Debug""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org