From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 14:42:12 +0000 Subject: Merged out from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68 --- packaging/windows/INSTALL_NOTES.html | 6 +++--- packaging/windows/installer.proj | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'packaging') diff --git a/packaging/windows/INSTALL_NOTES.html b/packaging/windows/INSTALL_NOTES.html index 4aecce697a..f8e109cb36 100644 --- a/packaging/windows/INSTALL_NOTES.html +++ b/packaging/windows/INSTALL_NOTES.html @@ -1,11 +1,11 @@ -Apache Qpid C++ 0.9 Installation Notes +Apache Qpid C++ 0.10 Installation Notes -

Apache Qpid C++ 0.9 Installation Notes

Apache Qpid C++ 0.10 Installation Notes

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

Thank you for installing Apache Qpid version 0.10 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.

diff --git a/packaging/windows/installer.proj b/packaging/windows/installer.proj index 7be5fda472..5dc16b0bfa 100644 --- a/packaging/windows/installer.proj +++ b/packaging/windows/installer.proj @@ -20,7 +20,7 @@ @@ -87,7 +87,8 @@ - + + @@ -217,9 +218,9 @@ OutputFile="boost_dlls.wxs" /> + OutputFile="qpidc-0.13-x64.msi" /> --> @@ -229,13 +230,19 @@ + Command="heat file $(staging_dir)\examples\README.txt -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_README.wxs" /> + + + + Command="candle -dqpidc_version=0.13 -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-0.13-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj examples_qmf-console.wixobj api_docs.wixobj" /> -- cgit v1.2.1