Initial Windows installer builder combining C++ and WCF components in a WiX-based installer. Merged in from 0.6-release-windows-installer branch r926803

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

9 files changed, 699 insertions, 3 deletions

diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index b09309cb9c..733b4848f9 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -246,14 +246,47 @@ if (MSVC)
                ${_boost_regex_debug} ${_boost_regex_release}
                ${_boost_system_debug} ${_boost_system_release}
                ${_boost_thread_debug} ${_boost_thread_release}
-               DESTINATION ${QPID_INSTALL_LIBDIR}
+               DESTINATION ${QPID_INSTALL_LIBDIR}/boost
                COMPONENT ${QPID_COMPONENT_COMMON})
    endif (QPID_LINK_BOOST_DYNAMIC)
 
-   # Need the boost headers regardless of which way the libs go.
+   # Need the boost headers regardless of which way the libs go. Try to
+   # weed out what we don't need, else it's giant and unnecessary.
    install (DIRECTORY ${Boost_INCLUDE_DIR}/boost
             DESTINATION ${QPID_INSTALL_INCLUDEDIR}
-            COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE})
+            COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}
+            PATTERN "accumulators/*" EXCLUDE
+            PATTERN "algorithm/*" EXCLUDE
+            PATTERN "archive/*" EXCLUDE
+            PATTERN "asio*" EXCLUDE
+            PATTERN "bimap*" EXCLUDE
+            PATTERN "circular_buffer*" EXCLUDE
+            PATTERN "concept*" EXCLUDE
+            PATTERN "dynamic_bitset*" EXCLUDE
+            PATTERN "flyweight*" EXCLUDE
+            PATTERN "fusion*" EXCLUDE
+            PATTERN "gil*" EXCLUDE
+            PATTERN "graph*" EXCLUDE
+            PATTERN "interprocess*" EXCLUDE
+            PATTERN "lambda/*" EXCLUDE
+            PATTERN "logic*" EXCLUDE
+            PATTERN "math*" EXCLUDE
+            PATTERN "mpi*" EXCLUDE
+            PATTERN "multi_*" EXCLUDE
+            PATTERN "numeric*" EXCLUDE
+            PATTERN "pending*" EXCLUDE
+            PATTERN "pool*" EXCLUDE
+            PATTERN "property_map*" EXCLUDE
+            PATTERN "proto*" EXCLUDE
+            PATTERN "random*" EXCLUDE
+            PATTERN "range*" EXCLUDE
+            PATTERN "signals*" EXCLUDE
+            PATTERN "spirit*" EXCLUDE
+            PATTERN "statechart*" EXCLUDE
+            PATTERN "units*" EXCLUDE
+            PATTERN "unordered*" EXCLUDE
+            PATTERN "wave*" EXCLUDE
+            PATTERN "xpressive*" EXCLUDE)
 
    set(Boost_DATE_TIME_LIBRARY "")
    set(Boost_THREAD_LIBRARY "")
@@ -590,6 +623,19 @@ install (TARGETS qpidcommon
          DESTINATION ${QPID_INSTALL_LIBDIR}
          COMPONENT ${QPID_COMPONENT_COMMON})
 
+if (WIN32)
+    # Need the .pdb file, which isn't installed with the .dll/.lib
+    # Not built... if needed, add the build option then uncomment this.
+    #get_target_property(qpidcommon_dll qpidcommon LOCATION)
+    #string(REPLACE .dll .pdb qpidcommon_pdb ${qpidcommon_dll})
+    #string(REPLACE $(OutDir) \${CMAKE_INSTALL_CONFIG_NAME} qpidcommon_pdb ${qpidcommon_pdb})
+    #message(STATUS "_pdb: ${qpidcommon_pdb}")
+    #install (PROGRAMS
+    #         ${qpidcommon_pdb}
+    #         DESTINATION ${QPID_INSTALL_LIBDIR}
+    #         COMPONENT ${QPID_COMPONENT_CLIENT})
+endif (WIN32)
+
 set (qpidclient_SOURCES
      ${rgen_client_srcs}
      ${qpidclient_platform_SOURCES}
@@ -681,6 +727,7 @@ install (DIRECTORY ../include/qpid
          DESTINATION ${QPID_INSTALL_INCLUDEDIR}
          COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}
          PATTERN ".svn" EXCLUDE)
+
 # Released source artifacts from Apache have the generated headers included in
 # the source tree, not the binary tree. So don't attempt to grab them when
 # they're not supposed to be there.
@@ -691,6 +738,18 @@ if (NOT QPID_GENERATED_HEADERS_IN_SOURCE)
 endif (NOT QPID_GENERATED_HEADERS_IN_SOURCE)
 
 if (WIN32)
+    # Need the .pdb file, which isn't installed with the .dll/.lib
+    #get_target_property(qpidclient_dll qpidclient LOCATION)
+    #string(REPLACE .dll .pdb qpidclient_pdb ${qpidclient_dll})
+    #string(REPLACE $(OutDir) \${CMAKE_INSTALL_CONFIG_NAME} qpidclient_pdb ${qpidclient_pdb})
+    #message(STATUS "_pdb: ${qpidclient_pdb}")
+    #install (PROGRAMS
+    #         ${qpidclient_pdb}
+    #         DESTINATION ${QPID_INSTALL_LIBDIR}
+    #         COMPONENT ${QPID_COMPONENT_CLIENT})
+endif (WIN32)
+
+if (WIN32)
     set(AMQP_WCF_DIR ${qpid-cpp_SOURCE_DIR}/../wcf)
     set(DTC_PLUGIN_SOURCE ${AMQP_WCF_DIR}/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp)
     if (EXISTS ${DTC_PLUGIN_SOURCE})
@@ -905,6 +964,17 @@ set_target_properties (qmfconsole PROPERTIES
 install (TARGETS qmfconsole
          DESTINATION ${QPID_INSTALL_LIBDIR}
          COMPONENT ${QPID_COMPONENT_QMF})
+if (WIN32)
+    # Need the .pdb file, which isn't installed with the .dll/.lib
+    #get_target_property(qmfconsole_dll qmfconsole LOCATION)
+    #string(REPLACE .dll .pdb qmfconsole_pdb ${qmfconsole_dll})
+    #string(REPLACE $(OutDir) \${CMAKE_INSTALL_CONFIG_NAME} qmfconsole_pdb ${qmfconsole_pdb})
+    #message(STATUS "_pdb: ${qmfconsole_pdb}")
+    #install (PROGRAMS
+    #         ${qmfconsole_pdb}
+    #         DESTINATION ${QPID_INSTALL_LIBDIR}
+    #         COMPONENT ${QPID_COMPONENT_QMF})
+endif (WIN32)
 
 # A queue event listener plugin that creates messages on a replication
 # queue corresponding to enqueue and dequeue events:
diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
new file mode 100644
index 0000000000..71eaf542b1
--- /dev/null
+++ b/qpid/packaging/windows/INSTALL_NOTES.html
@@ -0,0 +1,71 @@
+<html>

+<head>

+<title>Apache Qpid C++ 0.5 Release Notes</title>

+</head>

+<body>

+<H1>Apache Qpid C++ 0.5 Installation Notes</H1>

+

+<p>Thank you for installing the Apache Qpid version 0.5 C++ 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>

+

+<H2>Running a Message Broker</H2>

+<p>

+In AMQP, programs that send and receive messages are clients. The agents

+that route and queue messages to and from clients are brokers. In order to

+use any Qpid-based messaging program there must be at least one broker

+running which the client(s) can communicate with. The broker need not execute

+on the same system as the client, but it must be reachable using TCP/IP.</p>

+

+<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

+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

+</pre>

+A small amount of information will be displayed to let you know the broker

+is running and listening for client connections.</p>

+<p>To stop the broker, you can simply type <code>^C</code> in the

+command prompt window where the broker is running.</p>

+

+<p>For a full list of options for the broker, you can use the

+<code>--help</code> option.</p>

+

+<H2>Using the Example Programs</H2>

+

+<p>The example programs are located in the <code>examples</code> subdirectory

+of the Qpid installation directory. There are a number of examples, each with

+its own subdirectory under <code>examples</code>. You can use the examples to

+<ul>

+<li>Study to learn Qpid programming techniques you may want to use</li>

+<li>Build and run to observe and test Qpid features</li>

+</ul>

+Each example's directory contains source code and Visual Studio 2008 project

+files you can use to build the examples.</p>

+

+<H2>Reading the C++ API Reference Documentation</H2>

+<p>The C++ API reference documentation is HTML and can be viewed using

+your web browser. It is located in the <code>docs\api\html</code> subdirectory

+of the installation directory, but there is also a shortcut to the

+documentation in <i>Start > All Programs > Apache Qpid > Qpid C++ Reference

+Documentation</i>. Selecting that menu item will launch the documentation's

+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>

+

+<H1>For More Information</H1>

+<p>For more information on Apache Qpid, please visit the web site

+<a href="http://qpid.apache.org/">http://qpid.apache.org/</a>.</p>

+

+<p>The Qpid site contains more information about Qpid and AMQP as well as

+directions for joining and reading the Qpid-related email lists.</p>

+</body>

+</html>

diff --git a/qpid/packaging/windows/LICENSE.rtf b/qpid/packaging/windows/LICENSE.rtf
new file mode 100644
index 0000000000..04fddfe8b6
--- /dev/null
+++ b/qpid/packaging/windows/LICENSE.rtf
@@ -0,0 +1,110 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Courier New;}}


+{\*\generator Msftedit 5.41.21.2500;}\viewkind4\uc1\pard\qc\lang1033\f0\fs20 Apache License\par


+Version 2.0, January 2004\par


+http://www.apache.org/licenses/\par


+\pard\par


+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par


+\par


+1. Definitions.\par


+\par


+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\par


+\par


+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\par


+\par


+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\par


+\par


+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.\par


+\par


+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation, source, and configuration files.\par


+\par


+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\par


+\par


+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\par


+\par


+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\par


+\par


+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."\par


+\par


+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\par


+\par


+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\par


+\par


+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license plies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.\par


+\par


+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\par


+\par


+      (a) You must give any other recipients of the Work or\par


+          Derivative Works a copy of this License; and\par


+\par


+      (b) You must cause any modified files to carry prominent notices\par


+          stating that You changed the files; and\par


+\par


+      (c) You must retain, in the Source form of any Derivative Works\par


+          that You distribute, all copyright, patent, trademark, and\par


+          attribution notices from the Source form of the Work,\par


+          excluding those notices that do not pertain to any part of\par


+          the Derivative Works; and\par


+\par


+      (d) If the Work includes a "NOTICE" text file as part of its\par


+          distribution, then any Derivative Works that You distribute\par


+          must include a readable copy of the attribution notices\par


+          contained within such NOTICE file, excluding those notices\par


+          that do not pertain to any part of the Derivative Works, in\par


+          at least one of the following places: within a NOTICE text\par


+          file distributed as part of the Derivative Works; within the\par


+          Source form or documentation, if provided along with the\par


+          Derivative Works; or, within a display generated by the\par


+          Derivative Works, if and wherever such third-party notices\par


+          normally appear. The contents of the NOTICE file are for\par


+          informational purposes only and do not modify the License.\par


+          You may add Your own attribution notices within Derivative\par


+          Works that You distribute, alongside or as an addendum to the\par


+          NOTICE text from the Work, provided that such additional\par


+          attribution notices cannot be construed as modifying the\par


+          License.\par


+\par


+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.\par


+\par


+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\par


+\par


+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\par


+\par


+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.\par


+\par


+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.\par


+\par


+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.\par


+\par


+END OF TERMS AND CONDITIONS\par


+\par


+APPENDIX: How to apply the Apache License to your work.\par


+\par


+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.\par


+\par


+   Copyright [yyyy] [name of copyright owner]\par


+\par


+   Licensed under the Apache License, Version 2.0 (the "License");\par


+   you may not use this file except in compliance with the License.\par


+   You may obtain a copy of the License at\par


+\par


+       http://www.apache.org/licenses/LICENSE-2.0\par


+\par


+   Unless required by applicable law or agreed to in writing, software\par


+   distributed under the License is distributed on an "AS IS" BASIS,\par


+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\par


+   implied. See the License for the specific language governing\par


+   permissions and limitations under the License.\par


+\par


+=======================================================================\par


+\par


+Boost Software License - Version 1.0 - August 17th, 2003\par


+\par


+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:\par


+\par


+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.\par


+\par


+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par


+\par


+\par


+}


+
diff --git a/qpid/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat
new file mode 100644
index 0000000000..705a4dd21e
--- /dev/null
+++ b/qpid/packaging/windows/build_installer.bat
@@ -0,0 +1,48 @@
+rem

+rem Licensed to the Apache Software Foundation (ASF) under one

+rem or more contributor license agreements.  See the NOTICE file

+rem distributed with this work for additional information

+rem regarding copyright ownership.  The ASF licenses this file

+rem to you under the Apache License, Version 2.0 (the

+rem "License"); you may not use this file except in compliance

+rem with the License.  You may obtain a copy of the License at

+rem

+rem   http://www.apache.org/licenses/LICENSE-2.0

+rem

+rem Unless required by applicable law or agreed to in writing,

+rem software distributed under the License is distributed on an

+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+rem KIND, either express or implied.  See the License for the

+rem specific language governing permissions and limitations

+rem under the License.

+

+@set vshome="%ProgramFiles%\Microsoft Visual Studio 9.0"

+if "%ProgramFiles(x86)%" == "" goto x86only

+@set vshome="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0"

+if /i %1 == x86  goto x86

+if /i %1 == x64  goto x64

+echo Error in script usage. The correct usage is:

+echo     %0 [arch]

+echo where [arch] is: x86 ^| x64

+goto :eof

+

+:x86only

+@set vsarch=x86

+@set bits=32

+goto run

+

+:x86

+@set vsarch=x86

+@set bits=32

+goto run

+

+:x64

+@set vsarch=amd64

+@set bits=64

+

+:run

+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"

+call %vshome%\VC\vcvarsall.bat %vsarch%

+msbuild /property:bits=%bits% installer.proj

diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj
new file mode 100644
index 0000000000..78679588bc
--- /dev/null
+++ b/qpid/packaging/windows/installer.proj
@@ -0,0 +1,200 @@
+<!--

+ Licensed to the Apache Software Foundation (ASF) under one

+ or more contributor license agreements.  See the NOTICE file

+ distributed with this work for additional information

+ regarding copyright ownership.  The ASF licenses this file

+ to you under the Apache License, Version 2.0 (the

+ "License"); you may not use this file except in compliance

+ with the License.  You may obtain a copy of the License at

+

+   http://www.apache.org/licenses/LICENSE-2.0

+

+ Unless required by applicable law or agreed to in writing,

+ software distributed under the License is distributed on an

+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ KIND, either express or implied.  See the License for the

+ specific language governing permissions and limitations

+ under the License.

+-->

+

+<!--

+ Packaging script for Apache Qpid on Windows

+

+ Builds the C++ and WCF components, and packages those along with user

+ documentation and the python pieces needed to generate QMF stuff.

+-->

+

+<Project DefaultTargets="Clean;Installer"

+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+

+    <PropertyGroup>

+	<build_dir>$(MSBuildProjectDirectory)\build</build_dir>

+	<source_root>$(MSBuildProjectDirectory)\..\..</source_root>

+	<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>

+	<bits Condition="'$(bits)' == ''">32</bits>

+	<OutputName>qpidc</OutputName>

+	<OutputType>Package</OutputType>

+	<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>

+        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\wix.targets</WixTargetsPath>

+    </PropertyGroup>

+

+    <Choose>

+        <When Condition="'$(bits)' == '64'">

+	    <PropertyGroup>

+	        <ProgramFiles>ProgramFiles64Folder</ProgramFiles>

+		<CmakeGenerator>%22Visual Studio 9 2008 Win64%22</CmakeGenerator>

+		<Architecture>x64</Architecture>

+	    </PropertyGroup>

+	</When>

+	<Otherwise>

+	    <PropertyGroup>

+	        <ProgramFiles>ProgramFilesFolder</ProgramFiles>

+		<CmakeGenerator>%22Visual Studio 9 2008%22</CmakeGenerator>

+		<Architecture>x86</Architecture>

+    </PropertyGroup>

+	</Otherwise>

+    </Choose>

+

+    <ItemGroup>

+	<CppDebugProjects Include="$(build_dir)\src\qpidcommon.vcproj"/>

+	<CppDebugProjects Include="$(build_dir)\src\qpidclient.vcproj"/>

+	<CppDebugProjects Include="$(build_dir)\src\qmfconsole.vcproj"/>

+    </ItemGroup>

+

+    <ItemGroup>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.dll"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.lib"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidcommond.pdb"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.dll"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.lib"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qpidclientd.pdb"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.dll"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.lib"/>

+	<CppDebugArtifacts Include="$(build_dir)\src\Debug\qmfconsoled.pdb"/>

+    </ItemGroup>

+

+    <ItemGroup>

+	<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\*"/>

+    </ItemGroup>

+

+    <ItemGroup>

+        <BoostDlls Include="$(staging_dir)\bin\boost_*.dll"/>

+    </ItemGroup>

+

+    <ItemGroup>

+        <WixExtension Include="WixUtilExtension">

+            <HintPath>$(WixToolPath)\WixUtilExtension.dll</HintPath>

+        </WixExtension>

+        <WixExtension Include="WixUIExtension">

+            <HintPath>$(WixToolPath)\WixUIExtension.dll</HintPath>

+        </WixExtension>

+    </ItemGroup>

+    <Import Project="$(WixTargetsPath)" />

+

+

+    <Target Name="Clean">

+    	<RemoveDir

+            Directories="$(build_dir);$(staging_dir)" />

+    </Target>

+

+    <Target Name="MakeBuildDirs">

+    	<MakeDir

+            Directories="$(build_dir);$(staging_dir)" />

+    </Target>

+

+    <Target Name="Configure" DependsOnTargets="MakeBuildDirs">

+        <Message Text="build: $(build_dir)"/>

+        <Message Text="stage: $(staging_dir)"/>

+    	<Exec

+	    Command="cmake -G $(CmakeGenerator) -DCMAKE_INSTALL_PREFIX=$(staging_dir) $(cmake_options) $(source_root)\cpp"

+	    WorkingDirectory="$(build_dir)" />

+    </Target>

+

+    <Target Name="BuildCpp" DependsOnTargets="Configure">

+        <!-- Using VCBuild here with a set of vcproj files misses the

+             dependencies, so use devenv to pick up everything. -->

+	<!-- Need to ignore the exit code until QMF engine builds clean -->

+	<Exec

+	    Command="devenv qpid-cpp.sln /build Release /Project ALL_BUILD"

+	    WorkingDirectory="$(build_dir)"

+	    IgnoreExitCode="true" />

+    </Target>

+

+    <Target Name="BuildCppDebug" DependsOnTargets="Configure">

+    	<VCBuild

+	    Projects="@(CppDebugProjects)"

+	    SolutionFile="$(build_dir)/qpid-cpp.sln"

+	    Configuration="Debug" />

+    </Target>

+

+    <!-- StopOnFirstFailure needed to avoid a weird error trying to compile WIN32 -->

+    <Target Name="BuildWcf" DependsOnTargets="BuildCpp">

+        <MSBuild

+	    Projects="$(source_root)\wcf\QpidWcf.sln"

+	    Properties="Configuration=Release;Platform=$(Architecture)"

+	    StopOnFirstFailure="false" />

+    </Target>

+

+    <Target Name="BuildDocs" DependsOnTargets="Configure">

+    	<VCBuild

+	    Projects="$(build_dir)\docs\api\user-api-docs.vcproj"

+	    SolutionFile="$(build_dir)/qpid-cpp.sln"

+	    Configuration="Release" />

+    </Target>

+

+    <Target Name="Stage"

+            DependsOnTargets="BuildCpp;BuildCppDebug;BuildWcf;BuildDocs">

+        <Exec

+	    Command="cmake -DCMAKE_INSTALL_CONFIG_NAME=%22Release%22 -P $(build_dir)\cmake_install.cmake" />

+    	<Copy

+	    SourceFiles="@(CppDebugArtifacts)"

+	    DestinationFolder="$(staging_dir)\bin" />

+    	<Copy

+	    SourceFiles="@(WcfArtifacts)"

+	    DestinationFolder="$(staging_dir)\bin" />

+	<Copy

+	    SourceFiles="@(WcfExamples)"

+	    DestinationFiles="@(WcfExamples->'$(staging_dir)\examples\%(RecursiveDir)%(Filename)%(Extension)')" />

+    </Target>

+

+    <Target Name="Installer" DependsOnTargets="Stage">

+    <!-- Would be nice to use the WiX Tasks but I'm getting what I think are

+         errors mixing 32- and 64-bit artifacts.

+    	<HeatDirectory

+	    ToolPath="$(WixToolPath)"

+	    Directory="$(staging_dir)\include\boost"

+	    ComponentGroupName="group_BoostHeaders"

+	    OutputFile="boost_headers.wxs" />

+	<HeatFile

+	    ToolPath="$(WixToolPath)"

+	    File="@(BoostDlls)"

+	    ComponentGroupName="group_BoostDlls"

+	    DirectoryRefId="QpidBin"

+	    OutputFile="boost_dlls.wxs" />

+	<Candle

+	    ToolPath="$(WixToolPath)"

+	    DefineConstants="qpidc_version=0.6"

+	    InstallerPlatform="x64"

+	    OutputFile="qpidc-0.6-x64.msi" />

+    -->

+        <Exec

+	    Command="heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs" />

+        <Exec

+	    Command="heat dir $(staging_dir)\include\boost -var var.boost_headers_dir -dr QpidInclude -gg -cg group_BoostHeaders -out boost_headers.wxs" />

+	<!-- HEAT5150 warns about self-registering DLLs; don't care -->

+	<Exec

+	    Command="heat dir $(staging_dir)\bin\boost -var var.boost_dll_dir -dr QpidBin -srd -gg -cg group_BoostDlls -sw5150 -out boost_dlls.wxs" />

+	<Exec

+	    Command="heat dir $(staging_dir)\examples -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples.wxs" />

+	<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)" />

+	<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>

+

+</Project>

diff --git a/qpid/packaging/windows/qpid-asf-banner.bmp b/qpid/packaging/windows/qpid-asf-banner.bmp
new file mode 100644
index 0000000000..76f33504fc
--- /dev/null
+++ b/qpid/packaging/windows/qpid-asf-banner.bmp
diff --git a/qpid/packaging/windows/qpid-asf-bkgrd.bmp b/qpid/packaging/windows/qpid-asf-bkgrd.bmp
new file mode 100644
index 0000000000..c1f2d250cd
--- /dev/null
+++ b/qpid/packaging/windows/qpid-asf-bkgrd.bmp
diff --git a/qpid/packaging/windows/qpid-icon.ico b/qpid/packaging/windows/qpid-icon.ico
new file mode 100644
index 0000000000..112f5d8f1f
--- /dev/null
+++ b/qpid/packaging/windows/qpid-icon.ico
diff --git a/qpid/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs
new file mode 100644
index 0000000000..6b2857f182
--- /dev/null
+++ b/qpid/packaging/windows/qpidc.wxs
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+

+ Licensed to the Apache Software Foundation (ASF) under one

+ or more contributor license agreements.  See the NOTICE file

+ distributed with this work for additional information

+ regarding copyright ownership.  The ASF licenses this file

+ to you under the Apache License, Version 2.0 (the

+ "License"); you may not use this file except in compliance

+ with the License.  You may obtain a copy of the License at

+

+   http://www.apache.org/licenses/LICENSE-2.0

+

+ Unless required by applicable law or agreed to in writing,

+ software distributed under the License is distributed on an

+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ KIND, either express or implied.  See the License for the

+ specific language governing permissions and limitations

+ under the License.

+

+-->

+

+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

+  <Product Id="818aca03-2bed-4baf-8408-361c29e8b6a4"

+           Name="Apache Qpid $(var.qpidc_version)"

+           Language="1033"

+           Version="$(var.qpidc_version).0.0"

+           Manufacturer="Apache Software Foundation"

+           UpgradeCode="006510A1-3D2F-4fa6-BF23-4F76AD68D6AF">

+

+    <Package Description="Apache Qpid C++ for Windows"

+             Manufacturer="Apache Software Foundation"

+             Id="*"

+             InstallerVersion="200"

+             Compressed="yes" />

+

+    <Media Id="1" Cabinet="qpidc.cab" EmbedCab="yes" />

+

+    <!-- Allow 64-bit builds to pick ProgramFiles64Folder instead -->

+    <? 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="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>

+        </Directory>

+      </Directory>

+      <Directory Id="ProgramMenuFolder">

+        <Directory Id="ApplicationProgramsFolder" Name="Apache Qpid"/>

+      </Directory>

+

+    </Directory>

+

+    <DirectoryRef Id="INSTALLLOCATION">

+      <Component Id="InstallNotes" Guid="{10A64ABE-B3F7-40c0-88F1-E0AD71467A3E}">

+        <File Id="InstallNotesHTML" Source="INSTALL_NOTES.html"/>

+      </Component>

+    </DirectoryRef>

+

+    <DirectoryRef Id="QpidBin">

+      <Component Id="Broker_Release" Guid="c65883b5-0119-4704-9770-1c3369a8acd7">

+        <File Id="BrokerEXE" Source="$(var.staging_dir)\bin\qpidd.exe"/>

+        <File Id="BrokerDLL" Source="$(var.staging_dir)\bin\qpidbroker.dll"/>

+      </Component>

+      <Component Id="CommonLib_Debug" Guid="CE7DDC23-78F9-4DE3-A8BB-9E9652A413DC">

+        <File Id="CommonDebugLIB" Source="$(var.staging_dir)\bin\qpidcommond.lib"/>

+        <File Id="CommonDebugDLL" Source="$(var.staging_dir)\bin\qpidcommond.dll"/>

+        <File Id="CommonDebugPDB" Source="$(var.staging_dir)\bin\qpidcommond.pdb"/>

+

+        <Environment Id="envPath" Separator=";" Action="set" Permanent="no"

+                     Name="PATH" System="no" Part="last" Value="[QpidBin]"/>

+      </Component>

+      <Component Id="CommonLib_Release" Guid="BB2FA938-25CB-498e-A3D8-D6C475B82853">

+        <File Id="CommonReleaseLIB" Source="$(var.staging_dir)\bin\qpidcommon.lib"/>

+        <File Id="CommonReleaseDLL" Source="$(var.staging_dir)\bin\qpidcommon.dll"/>

+        <!-- File Id="CommonReleasePDB" Source="$(var.staging_dir)\bin\qpidcommon.pdb"/ -->

+      </Component>

+      <Component Id="ClientLib_Debug" Guid="2AB8EA8C-8AD5-4A8E-8CB3-E525A59962A3">

+        <File Id="ClientDebugLIB" Source="$(var.staging_dir)\bin\qpidclientd.lib"/>

+        <File Id="ClientDebugDLL" Source="$(var.staging_dir)\bin\qpidclientd.dll"/>

+        <File Id="ClientDebugPDB" Source="$(var.staging_dir)\bin\qpidclientd.pdb"/>

+      </Component>

+      <Component Id="ClientLib_Release" Guid="7312671F-CE68-4fac-ACF1-E6D90EA5F070">

+        <File Id="ClientReleaseLIB" Source="$(var.staging_dir)\bin\qpidclient.lib"/>

+        <File Id="ClientReleaseDLL" Source="$(var.staging_dir)\bin\qpidclient.dll"/>

+        <!-- File Id="ClientReleasePDB" Source="$(var.staging_dir)\bin\qpidclient.pdb"/ -->

+      </Component>

+      <Component Id="ClientWCFDLL" Guid="FF88DEAF-59BC-4846-993A-0D317E094DF4">

+        <File Id="ChannelDLL" Source="$(var.staging_dir)\bin\Apache.Qpid.Channel.dll"/>

+        <File Id="InteropDLL" Source="$(var.staging_dir)\bin\Apache.Qpid.Interop.dll"/>

+        <File Id="XARMDLL" Source="$(var.staging_dir)\bin\qpidxarm.dll"/>

+      </Component>

+

+      <Component Id="QMFConsoleLib_Debug" Guid="B5169DDE-B4E8-4c5e-A507-DDFA1DF8DDF8">

+        <File Id="QMFConsoleDebugLIB" Source="$(var.staging_dir)\bin\qmfconsoled.lib"/>

+        <File Id="QMFConsoleDebugDLL" Source="$(var.staging_dir)\bin\qmfconsoled.dll"/>

+        <File Id="QMFConsoleDebugPDB" Source="$(var.staging_dir)\bin\qmfconsoled.pdb"/>

+      </Component>

+      <Component Id="QMFConsoleLib_Release" Guid="5DD7ADAC-D944-4694-A4F2-0022B7A6931E">

+        <File Id="QMFConsoleReleaseLIB" Source="$(var.staging_dir)\bin\qmfconsole.lib"/>

+        <File Id="QMFConsoleReleaseDLL" Source="$(var.staging_dir)\bin\qmfconsole.dll"/>

+        <!-- File Id="QMFConsoleReleasePDB" Source="$(var.staging_dir)\bin\qmfconsole.pdb"/ -->

+      </Component>

+

+    </DirectoryRef>

+

+    <!-- DirectoryRef Id="QpidSrcDist">

+      <Component Id="DistroSrc" Guid="{0D2C11F3-B3B6-4d4b-9569-08097A4D0D1A}">

+        <File Id="DistroTAR" Source="..\qpid-cpp-0.5.tar.gz"/>

+      </Component>

+    </DirectoryRef -->

+

+    <DirectoryRef Id="ApplicationProgramsFolder">

+      <Component Id="APIDocShortcut" Guid="{B95A28E2-E2B5-4f31-93C3-24B010701F30}">

+        <Shortcut Id="APIDocsShortcut"

+                  Name="Qpid C++ Reference Documentation"

+                  Description="Shortcut to HTML reference documentation"

+                  Target="[INSTALLLOCATION]docs\api\html\index.html" />

+        <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>

+        <RegistryValue Root="HKCU" Key="Software\Apache\qpidc" Name="installed" Type="integer" Value="1" KeyPath="yes"/>

+      </Component>

+    </DirectoryRef>

+

+    <Feature Id="ProductFeature" Title="Apache Qpid C++" Level="1"

+             Display="expand" ConfigurableDirectory="INSTALLLOCATION"

+             TypicalDefault="install">

+      <ComponentRef Id="InstallNotes"/>

+

+      <Feature Id="Broker" Title="Broker: Routes and queues messages" Level="1">

+        <ComponentRef Id="Broker_Release"/>

+        <ComponentRef Id="CommonLib_Release"/>

+	<ComponentGroupRef Id="group_BoostDlls"/>

+      </Feature>

+

+      <Feature Id="ClientLib" Title="Client Libraries and Headers to develop and run programs" Level="1">

+        <ComponentRef Id="CommonLib_Debug"/>

+        <ComponentRef Id="CommonLib_Release"/>

+        <ComponentRef Id="ClientLib_Debug"/>

+        <ComponentRef Id="ClientLib_Release"/>

+        <ComponentRef Id="QMFConsoleLib_Debug"/>

+        <ComponentRef Id="QMFConsoleLib_Release"/>

+        <ComponentRef Id="ClientWCFDLL"/>

+        <ComponentGroupRef Id="group_QpidHeaders"/>

+	<ComponentGroupRef Id="group_BoostHeaders"/>

+        <ComponentGroupRef Id="group_BoostDlls"/>

+

+        <Feature Id="Examples" Title="Client Programming Examples" Level="1">

+          <ComponentGroupRef Id="group_Examples"/>

+        </Feature>

+      </Feature>

+

+      <Feature Id="APIDocs" Title="Client C++ API Reference Documentation" Level="1">

+        <ComponentRef Id="APIDocShortcut"/>

+        <ComponentGroupRef Id="group_APIDocs"/>

+      </Feature>

+

+      <!-- Feature Id="FullDistro" Title="Full C++ Source in a zip file" Level="3">

+        <ComponentRef Id="DistroSrc"/>

+      </Feature -->

+    </Feature>

+

+    <Icon Id="QpidIcon.exe" SourceFile="qpid-icon.ico"/>

+    <Property Id="ARPPRODUCTICON" Value="QpidIcon.exe" />

+    <Property Id="ALLUSERS" Value="1"/>

+

+    <UI>

+      <UIRef Id="WixUI_FeatureTree" />

+      <Publish Dialog="ExitDialog"

+               Control="Finish" 

+               Event="DoAction" 

+               Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>

+

+    </UI>

+

+    <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />

+    <WixVariable Id="WixUIBannerBmp" Value="qpid-asf-banner.bmp" />

+    <WixVariable Id="WixUIDialogBmp" Value="qpid-asf-bkgrd.bmp" />

+

+    <!-- Launch the install notes optionally on finish -->

+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"

+              Value="View the installation notes for more information"/>

+    <Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOX' Value='1' />

+    <Property Id="WixShellExecTarget" Value="[#InstallNotesHTML]" />

+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA"

+                  DllEntry="WixShellExec" Impersonate="yes" />

+

+  </Product>

+</Wix>