From b7a05b8debd456793fb114ac1f1abda9d2acfbb7 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 25 Mar 2010 00:21:18 +0000 Subject: Add missing qpidxarm.dll and plug-ins to installer; resolves QPID-2467. Fix multi-platform installer build, legal files placement, install notes doc, and other miscellaneous nits in the installer. (Merged in from 0.6-release-windows-installer branch r927233) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@927239 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeLists.txt | 5 +-- qpid/packaging/windows/INSTALL_NOTES.html | 62 +++++++++++++++++++++++++----- qpid/packaging/windows/build_installer.bat | 7 ++++ qpid/packaging/windows/installer.proj | 8 ++-- qpid/packaging/windows/qpidc.wxs | 38 +++++++++++++----- 5 files changed, 95 insertions(+), 25 deletions(-) diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 485ead127a..dbed67efea 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -50,9 +50,8 @@ set (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf CACHE STRING set (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf CACHE STRING "Name of the Qpid broker configuration file") -install(FILES LICENSE NOTICE README SSL RELEASE_NOTES DESIGN - xml/cluster.xml INSTALL-WINDOWS - DESTINATION ${QPID_INSTALL_DATADIR}) +install(FILES LICENSE NOTICE DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(FILES xml/cluster.xml DESTINATION ${QPID_INSTALL_DATADIR}) if (WIN32) set (CMAKE_DEBUG_POSTFIX "d") diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html index 71eaf542b1..f875844425 100644 --- a/qpid/packaging/windows/INSTALL_NOTES.html +++ b/qpid/packaging/windows/INSTALL_NOTES.html @@ -1,11 +1,11 @@ -Apache Qpid C++ 0.5 Release Notes +Apache Qpid C++ 0.6 Installation Notes -

Apache Qpid C++ 0.5 Installation Notes

Apache Qpid C++ 0.6 Installation Notes

Thank you for installing the Apache Qpid version 0.5 C++ kit. +

Thank you for installing the Apache Qpid version 0.6 for Windows kit. 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.

@@ -20,12 +20,12 @@ on the same system as the client, but it must be reachable using TCP/IP.

The broker executable is installed in the bin subdirectory of your Qpid installation directory. The broker program is -qpidbroker.exe. The simplest way to experiment with the +qpidd.exe. The simplest way to experiment with the broker is to open a command prompt window, cd to the installation directory, and execute the broker:

-cd "C:\Program Files\Apache\qpidc-0.5\bin"
-qpidbroker
+cd "C:\Program Files\Apache\qpidc-0.6\bin"
+qpidd

A small amount of information will be displayed to let you know the broker is running and listening for client connections.

@@ -56,10 +56,52 @@ Documentation. Selecting that menu item will launch the documentation's main page in your default web browser.

Complete Source Code is Available

If you installed the complete source code feature (which is disabled by -default) you can explore all the source code for all of Apache Qpid. This -includes the Visual Studio 2008 project files necessary for rebuilding Qpid -should you wish to do so.

If you wish to view Qpid's source code, please visit + +http://qpid.apache.org/download.html. The source components used to build +this installed kit are "C++ broker & client" and "C# (.NET, WCF) WCF +channel (C++ Broker Compatible)."

+ +

Notes

Please read the following sections for important notes regarding this +release.

WCF Channel

This release includes a new .NET WCF Channel implementation. The WCF DLL +is named Apache.Qpid.Channel.dll located in the bin +directory under the Qpid installation location.

WCF Channel programming examples are located in the +examples\Channel under the installation directory.

The WCF Channel DLLs are not loaded into the Global Assembly Cache (GAC) +at install time; therefore, they must be referenced explicitly from the install +location.

If you wish to install the WCF Channel DLLs into the GAC, you can use the +following commands (assuming the Qpid install location is +C:\Program Files\Apache\qpidc-0.6):

+gacutil -I "C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Channel.dll"
+gacutil -I "C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Interop.dll"
+

To remove the DLLs from the GAC:

+gacutil /u "Apache.Qpid.Channel"
+gacutil /u "Apache.Qpid.Interop"
+

+ +

Broker Persistence Module

This release includes a new persistence module. The broker can use this +module to facilitate durable queues, exchanges, bindings, configuration, and +messages. The persistence module uses SQL Server Express (or SQL Server) 2005 +or newer. The persistence module is a Qpid broker plugin. It is not loaded by +default; therefore, to gain support for durable items the persistence plugin +must be loaded into the broker. This can be done using the +--module-dir option to load all available plugins. For example: +

+cd "C:\Program Files\Apache\qpidc-0.6"
+bin\qpidd.exe --module-dir plugins\broker
+

+The --module-dir option can also take a full path. The option +can also be included in the broker configuration file. A sample is located +in the conf\qpidd.conf file under the installation directory.

For More Information

For more information on Apache Qpid, please visit the web site diff --git a/qpid/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat index 705a4dd21e..addc33f32b 100644 --- a/qpid/packaging/windows/build_installer.bat +++ b/qpid/packaging/windows/build_installer.bat @@ -41,6 +41,13 @@ goto run @set bits=64 :run +rem Two environment variables need to be set: +rem QPID_BUILD_ROOT: root of the build directory; $cwd\build unless the +rem build_dir property is set in msbuild properties below. +rem BOOST_ROOT: root of the Boost installation + +set QPID_BUILD_ROOT=%CD%\build + rem If the local cmake needs help, add options to the cmake_options property. rem For example: cmake_options="-DBOOST_INCLUDE_DIR=C:/Boost/boost-1_40 rem -DBOOST_LIBRARYDIR=C:/Boost/boost-1_40/lib64" diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index 78679588bc..de68b05626 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -44,6 +44,7 @@ ProgramFiles64Folder %22Visual Studio 9 2008 Win64%22 x64 + x64 @@ -51,6 +52,7 @@ ProgramFilesFolder %22Visual Studio 9 2008%22 x86 + Win32 @@ -77,7 +79,7 @@ + Exclude="$(source_root)\wcf\samples\**\.svn\**"/> @@ -134,7 +136,7 @@ @@ -192,7 +194,7 @@ + Command="candle -dqpidc_version=0.6 -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 qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" /> diff --git a/qpid/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs index c4a3bf9169..924e92d20f 100644 --- a/qpid/packaging/windows/qpidc.wxs +++ b/qpid/packaging/windows/qpidc.wxs @@ -37,23 +37,25 @@ - + - - + - - + + + + + @@ -64,6 +66,10 @@ + + + + @@ -113,11 +119,21 @@ - + + + + + + + + @@ -134,14 +150,18 @@ Display="expand" ConfigurableDirectory="INSTALLLOCATION" TypicalDefault="install"> + + + + -- cgit v1.2.1