From e9bbca10780ca2ccae979f27f7417c3a8fad9f9a Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Sat, 10 Dec 2011 17:05:19 +0000 Subject: Gets the examples up to date to just before they changed to separate msvc9 and 10 directories. Solves the immediately reported issue but more work will be needed under a different jira. Resolves QPID-3674. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1212826 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/packaging/windows/INSTALL_NOTES.html | 13 +++++++++---- qpid/packaging/windows/installer.proj | 17 ++++++----------- qpid/packaging/windows/qpidc.wxs | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html index f8e109cb36..ad57eb8a36 100644 --- a/qpid/packaging/windows/INSTALL_NOTES.html +++ b/qpid/packaging/windows/INSTALL_NOTES.html @@ -1,11 +1,11 @@ -Apache Qpid C++ 0.10 Installation Notes +Apache Qpid C++ 0.15 Installation Notes -

Apache Qpid C++ 0.10 Installation Notes

Apache Qpid C++ 0.15 Installation Notes

Thank you for installing Apache Qpid version 0.10 for Windows. +

Thank you for installing Apache Qpid version 0.15 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation.

@@ -36,6 +36,11 @@ command prompt window where the broker is running.

Using the Example Programs

If you installed the example programs, a new environment variable was +set. QPID_ROOT refers to the Qpid installation directory. The +Visual Studio project files located in the examples area refer to +QPID_ROOT to locate both header files and library files.

The example programs are located in the examples subdirectory of the Qpid installation directory. There are a number of examples, each with its own subdirectory under examples. You can use the examples to @@ -78,7 +83,7 @@ default; therefore, to gain support for durable items the persistence plugin must be loaded into the broker. This can be done using the --load-module option to load the needed plugins. For example:

-cd "C:\Program Files\Apache\qpidc-0.9"
+cd "C:\Program Files\Apache\qpidc-0.15"
 qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll

The --load-module option can also take a full path. The option diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index b02bdf5b8e..5a3f1e0201 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -32,6 +32,7 @@ $(MSBuildProjectDirectory)\..\.. $(MSBuildProjectDirectory)\stage 32 + 0.14 qpidc Package C:\Program Files (x86)\Windows Installer XML v3.5\bin @@ -218,9 +219,9 @@ OutputFile="boost_dlls.wxs" /> + OutputFile="qpidc-$(qpid_version)-x64.msi" /> --> @@ -230,19 +231,13 @@ - - - + Command="heat dir $(staging_dir)\examples -var var.examples_dir -dr QpidExamples -srd -gg -cg group_Examples -out examples.wxs" /> + Command="candle -dqpidc_version=$(qpid_version) -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" /> + Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-$(qpid_version)-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj" /> diff --git a/qpid/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs index 8e73ea0661..7c07a14420 100644 --- a/qpid/packaging/windows/qpidc.wxs +++ b/qpid/packaging/windows/qpidc.wxs @@ -78,8 +78,8 @@ Name="PATH" System="yes" Part="last" Value="[QpidBin]"/> - -- cgit v1.2.1