Apply patch from QPID-2103.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@823350 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 14 insertions, 14 deletions

diff --git a/wcf/ReadMe.txt b/wcf/ReadMe.txt
index 0ef3e06ce5..6f118ceac3 100644
--- a/wcf/ReadMe.txt
+++ b/wcf/ReadMe.txt
@@ -49,9 +49,9 @@ NOTE: In the following instructions %QPID_ROOT% refers to the root of
 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 @@ System Development Edition, or Team System Team Suite SKU)
    %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.
 
 
diff --git a/wcf/src/Apache/Qpid/Interop/Interop.vcproj b/wcf/src/Apache/Qpid/Interop/Interop.vcproj
index 32f78c8344..484f6898fb 100644
--- a/wcf/src/Apache/Qpid/Interop/Interop.vcproj
+++ b/wcf/src/Apache/Qpid/Interop/Interop.vcproj
@@ -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"

diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat b/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
index 4b83993257..a5eed8839b 100755
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
+++ b/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
@@ -19,15 +19,15 @@ REM under the License.
 
 
 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
 
diff --git a/wcf/tools/QCreate/QCreate.vcproj b/wcf/tools/QCreate/QCreate.vcproj
index e58077d78c..ba77952966 100644
--- a/wcf/tools/QCreate/QCreate.vcproj
+++ b/wcf/tools/QCreate/QCreate.vcproj
@@ -61,7 +61,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(BOOST_ROOT)\include\$(BOOST_VERSION)&quot;;&quot;$(BOOST_ROOT)\.&quot;;..\..\..\cpp\include;..\..\..\cpp\build\include"

+				AdditionalIncludeDirectories="&quot;$(BOOST_ROOT)\include\$(BOOST_VERSION)&quot;;&quot;$(BOOST_ROOT)\.&quot;;..\..\..\cpp\include;&quot;$(QPID_BUILD_ROOT)\include&quot;"

 				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=".;&quot;$(BOOST_ROOT)\lib&quot;;..\..\..\cpp\build\src\Debug"

+				AdditionalLibraryDirectories=".;&quot;$(BOOST_ROOT)\lib&quot;;&quot;$(QPID_BUILD_ROOT)\src\Debug&quot;"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"