merge default into bug20945

Author: tonyg

.hgignore

@@ -10,5 +10,8 @@ syntax: regexp
 
 ^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
 ^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
+^wix/dotnet-client-merge-module\.wxs$
+^wix/dotnet-client-product\.wxs$
+^wix/License\.rtf$
 ~$
 

default.build

@@ -20,6 +20,8 @@
   <property name="existence.test.probe" value="${gensrc.dir}/autogenerated-api-0-9.cs"/>
   <property name="unit-tests.dllname" value="${bin.dir}/unit-tests.dll"/>
   <property name="nunit.dllname" value="src/unit/nunit/nunit.framework.dll"/>
+
+  <property name="wix.build.file" value="wix/default.build" />
 
   <property name="core.assemblyinfo.src" value="src/client/api/AssemblyInfo.cs.in"/>
   <property name="core.assemblyinfo.target" value="${gensrc.dir}/AssemblyInfo.cs"/>
@@ -45,7 +47,7 @@
   <property name="web.url" value="http://stage.rabbitmq.com/" />
 
   <target name="clean" description="remove all generated files"
-	      depends="clean-base,clean-wcf" />
+	      depends="clean-base,clean-wcf,clean-wix,stamp" />
 
   <target name="clean-base" description="remove all generated files in the core client">
     <delete dir="${build.dir}" failonerror="false" />
@@ -64,6 +66,10 @@
     <delete dir="src/wcf/ConfigDemo/WcfServiceLibrary1/obj" failonerror="false"/>
     <delete file="${wcf.assemblyinfo.target}" failonerror="false"/> <!-- it's autogenerated -->
   </target>
+  
+  <target name="clean-wix">
+    <nant buildfile="${wix.build.file}" target="clean" />
+  </target>
 
   <target name="generate-assemblyinfo">
     <if test="${(not file::up-to-date(gen.assemblyinfo.src, gen.assemblyinfo.target))}">
@@ -156,6 +162,7 @@
   <target name="stamp" description="removes the version identifier, so that the next build generates a fresh one">
     <delete file="${core.assemblyinfo.target}" failonerror="false" />
     <delete file="${wcf.assemblyinfo.target}" failonerror="false" />
+    <nant buildfile="${wix.build.file}" target="stamp" />
   </target>
 
   <target name="doc" description="produces HTML documentation from the code"
@@ -541,4 +548,18 @@
     <call target="src-dist"/>
     <call target="copy-deliverables"/>
   </target>
+
+  <target name="build-windows-install-msm">
+    <call target="dist" />
+    <nant buildfile="${wix.build.file}" target="build-windows-install-msm" />
+  </target>
+
+  <target name="build-windows-install-msi">
+    <call target="dist" />
+    <nant buildfile="${wix.build.file}" target="build-windows-install-msi" />
+  </target>
+
+  <target name="validate-windows-install-msi">
+     <nant buildfile="${wix.build.file}" target="validate-windows-install-msi" />
+  </target>
 </project>

lib/darice.cub

@@ -11,3 +11,5 @@ NDocProc - .NET documentation compiler, akin to javadoc
 NUnit - unit-test library and driver
 
 Pyle 2 - wiki, used for rendering the user guide
+
+WiX - Windows Installer XML toolset, used for creating windows installer files

lib/mergemod.cub

@@ -0,0 +1,7 @@
+#! /bin/bash
+
+OUTPUT_DIR=../releases/rabbitmq-dotnet-client/v1.6.0
+
+mkdir -p $OUTPUT_DIR
+(cd $OUTPUT_DIR; wget http://www.rabbitmq.com/releases/rabbitmq-dotnet-client/v1.6.0/rabbitmq-dotnet-client-1.6.0-user-guide.pdf)
+(cd $OUTPUT_DIR; wget http://www.rabbitmq.com/releases/rabbitmq-dotnet-client/v1.6.0/rabbitmq-dotnet-client-1.6.0-api-guide.pdf)