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 2010/03/25 01:21:18 UTC
svn commit: r927239 - in /qpid/trunk/qpid: ./ cpp/ cpp/examples/tradedemo/
packaging/windows/
Author: shuston
Date: Thu Mar 25 00:21:18 2010
New Revision: 927239
URL: http://svn.apache.org/viewvc?rev=927239&view=rev
Log:
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)
Modified:
qpid/trunk/qpid/ (props changed)
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
qpid/trunk/qpid/packaging/windows/ (props changed)
qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
qpid/trunk/qpid/packaging/windows/build_installer.bat
qpid/trunk/qpid/packaging/windows/installer.proj
qpid/trunk/qpid/packaging/windows/qpidc.wxs
Propchange: qpid/trunk/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 00:21:18 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5.x-dev/qpid:892761,894875
/qpid/branches/0.6-release-windows-installer:926803
-/qpid/branches/0.6-release-windows-installer/qpid:926803
+/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=927239&r1=927238&r2=927239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Thu Mar 25 00:21:18 2010
@@ -50,9 +50,8 @@ set (QPIDC_CONF_FILE ${QPID_INSTALL_CONF
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")
Propchange: qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 00:21:18 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5.x-dev/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:892761,894875
/qpid/branches/0.6-release-windows-installer/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803
-/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218,927233
/qpid/branches/java-network-refactor/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:805429-825319
Propchange: qpid/trunk/qpid/packaging/windows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 00:21:18 2010
@@ -1,4 +1,4 @@
/qpid/branches/0.5.x-dev/qpid/packaging/windows:892761,894875
/qpid/branches/0.6-release-windows-installer/packaging/windows:926803
-/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926803,926865
+/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926803,926865,927233
/qpid/branches/java-network-refactor/qpid/packaging/windows:805429-825319
Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=927239&r1=927238&r2=927239&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Thu Mar 25 00:21:18 2010
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.5 Release Notes</title>
+<title>Apache Qpid C++ 0.6 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.5 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.6 Installation Notes</H1>
-<p>Thank you for installing the Apache Qpid version 0.5 C++ kit.
+<p>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.</p>
@@ -20,12 +20,12 @@ on the same system as the client, but it
<p>The broker executable is installed in the <code>bin</code> subdirectory
of your Qpid installation directory. The broker program is
-<code>qpidbroker.exe</code>. The simplest way to experiment with the
+<code>qpidd.exe</code>. The simplest way to experiment with the
broker is to open a command prompt window, cd to the installation
directory, and execute the broker:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.5\bin"
-qpidbroker
+cd "C:\Program Files\Apache\qpidc-0.6\bin"
+qpidd
</pre>
A small amount of information will be displayed to let you know the broker
is running and listening for client connections.</p>
@@ -56,10 +56,52 @@ Documentation</i>. Selecting that menu i
main page in your default web browser.</p>
<H2>Complete Source Code is Available</H2>
-<p>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.</p>
+<p>If you wish to view Qpid's source code, please visit
+<a href="http://qpid.apache.org/download.html">
+http://qpid.apache.org/download.html</a>. The source components used to build
+this installed kit are "C++ broker & client" and "C# (.NET, WCF) WCF
+channel (C++ Broker Compatible)."</p>
+
+<H1>Notes</H1>
+<p>Please read the following sections for important notes regarding this
+release.</p>
+<H2>WCF Channel</H2>
+<p>This release includes a new .NET WCF Channel implementation. The WCF DLL
+is named <code>Apache.Qpid.Channel.dll</code> located in the <code>bin</code>
+directory under the Qpid installation location.</p>
+<p>WCF Channel programming examples are located in the
+<code>examples\Channel</code> under the installation directory.</p>
+<p>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.</p>
+<p>If you wish to install the WCF Channel DLLs into the GAC, you can use the
+following commands (assuming the Qpid install location is
+<code>C:\Program Files\Apache\qpidc-0.6</code>):</p>
+<pre>
+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"
+</pre>
+<p>To remove the DLLs from the GAC:</p>
+<pre>
+gacutil /u "Apache.Qpid.Channel"
+gacutil /u "Apache.Qpid.Interop"
+</pre>
+
+<H2>Broker Persistence Module</H2>
+<p>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
+<code>--module-dir</code> option to load all available plugins. For example:
+<pre>
+cd "C:\Program Files\Apache\qpidc-0.6"
+bin\qpidd.exe --module-dir plugins\broker
+</pre>
+The <code>--module-dir</code> option can also take a full path. The option
+can also be included in the broker configuration file. A sample is located
+in the <code>conf\qpidd.conf</code> file under the installation directory.</p>
<H1>For More Information</H1>
<p>For more information on Apache Qpid, please visit the web site
Modified: qpid/trunk/qpid/packaging/windows/build_installer.bat
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/build_installer.bat?rev=927239&r1=927238&r2=927239&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/build_installer.bat (original)
+++ qpid/trunk/qpid/packaging/windows/build_installer.bat Thu Mar 25 00:21:18 2010
@@ -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"
Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=927239&r1=927238&r2=927239&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Thu Mar 25 00:21:18 2010
@@ -44,6 +44,7 @@
<ProgramFiles>ProgramFiles64Folder</ProgramFiles>
<CmakeGenerator>%22Visual Studio 9 2008 Win64%22</CmakeGenerator>
<Architecture>x64</Architecture>
+ <CSProjArchitecture>x64</CSProjArchitecture>
</PropertyGroup>
</When>
<Otherwise>
@@ -51,6 +52,7 @@
<ProgramFiles>ProgramFilesFolder</ProgramFiles>
<CmakeGenerator>%22Visual Studio 9 2008%22</CmakeGenerator>
<Architecture>x86</Architecture>
+ <CSProjArchitecture>Win32</CSProjArchitecture>
</PropertyGroup>
</Otherwise>
</Choose>
@@ -77,7 +79,7 @@
<WcfProjects Include="$(source_root)\wcf\src\Apache\Qpid\**\*.csproj"/>
<WcfArtifacts Include="$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\*.dll"/>
<WcfExamples Include="$(source_root)\wcf\samples\**\*"
- Exclude="$(source_root)\wcf\samples\**\.svn\*"/>
+ Exclude="$(source_root)\wcf\samples\**\.svn\**"/>
</ItemGroup>
<ItemGroup>
@@ -134,7 +136,7 @@
<Target Name="BuildWcf" DependsOnTargets="BuildCpp">
<MSBuild
Projects="$(source_root)\wcf\QpidWcf.sln"
- Properties="Configuration=Release;Platform=$(Architecture)"
+ Properties="Configuration=Release;Platform=$(CSProjArchitecture)"
StopOnFirstFailure="false" />
</Target>
@@ -192,7 +194,7 @@
<Exec
Command="heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs" />
<Exec
- Command="candle -dqpidc_version=0.6 -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)" />
+ 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)" />
<Exec
Command="light -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.6-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj" />
</Target>
Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/qpidc.wxs?rev=927239&r1=927238&r2=927239&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/qpidc.wxs (original)
+++ qpid/trunk/qpid/packaging/windows/qpidc.wxs Thu Mar 25 00:21:18 2010
@@ -37,23 +37,25 @@
<Media Id="1" Cabinet="qpidc.cab" EmbedCab="yes" />
<!-- Allow 64-bit builds to pick ProgramFiles64Folder instead -->
- <? Define ProgramFiles = "ProgramFilesFolder"?>
+ <?Define ProgramFiles = "ProgramFilesFolder"?>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.ProgramFiles)">
<Directory Id="ApacheTop" Name="Apache">
<Directory Id="INSTALLLOCATION" Name="qpidc-$(var.qpidc_version)">
<Directory Id="QpidBin" Name="bin"/>
- <Directory Id="QpidInclude" Name="include"/>
- <Directory Id="QpidExamples" Name="examples"/>
+ <Directory Id="QpidConf" Name="conf"/>
<Directory Id="QpidDoc" Name="docs">
<Directory Id="QpidDocAPI" Name="api"/>
</Directory>
-<!-- Make this a link to the apache web site with the tarball -->
- <!-- Directory Id="QpidSrcDist" Name="srcdist"/ -->
+ <Directory Id="QpidExamples" Name="examples"/>
+ <Directory Id="QpidInclude" Name="include"/>
+ <Directory Id="QpidPlugins" Name="plugins">
+ <Directory Id="QpidBrPlugin" Name="broker"/>
</Directory>
</Directory>
</Directory>
+ </Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="Apache Qpid"/>
</Directory>
@@ -64,6 +66,10 @@
<Component Id="InstallNotes" Guid="{10A64ABE-B3F7-40c0-88F1-E0AD71467A3E}">
<File Id="InstallNotesHTML" Source="INSTALL_NOTES.html"/>
</Component>
+ <Component Id="Legal" Guid="{D98B2A06-4A7E-488a-A7A9-BFB1B9D594A0}">
+ <File Id="LICENSE" Source="$(var.staging_dir)\LICENSE"/>
+ <File Id="NOTICE" Source="$(var.staging_dir)\NOTICE"/>
+ </Component>
</DirectoryRef>
<DirectoryRef Id="QpidBin">
@@ -113,11 +119,21 @@
</DirectoryRef>
- <!-- DirectoryRef Id="QpidSrcDist">
- <Component Id="DistroSrc" Guid="{0D2C11F3-B3B6-4d4b-9569-08097A4D0D1A}">
- <File Id="DistroTAR" Source="..\qpid-cpp-0.5.tar.gz"/>
+ <DirectoryRef Id="QpidConf">
+ <Component Id="BrokerConf" Guid="{8893D4B8-F87B-4da7-914A-87ED61E46577}">
+ <File Id="BrokerConfFile" Source="$(var.staging_dir)\conf\qpidd.conf"/>
+ </Component>
+ <Component Id="ClientConf" Guid="{2ED5B20C-9D57-4961-B928-6FC1436309F7}">
+ <File Id="ClientConfFile" Source="$(var.staging_dir)\conf\qpidc.conf"/>
</Component>
- </DirectoryRef -->
+ </DirectoryRef>
+
+ <DirectoryRef Id="QpidBrPlugin">
+ <Component Id="SQLPersistence" Guid="{DDF3AF70-C4E4-4745-BB7E-0E195FAF116B}">
+ <File Id="StorePlugin" Source="$(var.staging_dir)\plugins\broker\store.dll"/>
+ <File Id="SQLPlugin" Source="$(var.staging_dir)\plugins\broker\mssql_store.dll"/>
+ </Component>
+ </DirectoryRef>
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="APIDocShortcut" Guid="{B95A28E2-E2B5-4f31-93C3-24B010701F30}">
@@ -134,14 +150,18 @@
Display="expand" ConfigurableDirectory="INSTALLLOCATION"
TypicalDefault="install">
<ComponentRef Id="InstallNotes"/>
+ <ComponentRef Id="Legal"/>
<Feature Id="Broker" Title="Broker: Routes and queues messages" Level="1">
+ <ComponentRef Id="BrokerConf"/>
<ComponentRef Id="Broker_Release"/>
<ComponentRef Id="CommonLib_Release"/>
+ <ComponentRef Id="SQLPersistence"/>
<ComponentGroupRef Id="group_BoostDlls"/>
</Feature>
<Feature Id="ClientLib" Title="Client Libraries and Headers to develop and run programs" Level="1">
+ <ComponentRef Id="ClientConf"/>
<ComponentRef Id="CommonLib_Debug"/>
<ComponentRef Id="CommonLib_Release"/>
<ComponentRef Id="ClientLib_Debug"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org