Skip to content

Commit 3de6271

Browse files
author
Vlad Ionescu
committed
moving License.rtf to wix/; creating a separate nant build file for the windows installer
1 parent b4750c3 commit 3de6271

File tree

5 files changed

+115
-91
lines changed

5 files changed

+115
-91
lines changed

‎default.build

Lines changed: 12 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<property name="build.dir" value="build"/>
99
<property name="bin.dir" value="${build.dir}/bin" />
1010
<property name="dist.dir" value="${build.dir}/dist" />
11-
<property name="wix.build.dir" value="${build.dir}/wix" />
1211
<property name="wcf.dist.dir" value="${dist.dir}/wcf" />
1312
<property name="doc.dir" value="${build.dir}/doc" />
1413
<property name="gendoc.xml.dir" value="${doc.dir}/xml" />
@@ -21,6 +20,8 @@
2120
<property name="existence.test.probe" value="${gensrc.dir}/autogenerated-api-0-9.cs"/>
2221
<property name="unit-tests.dllname" value="${bin.dir}/unit-tests.dll"/>
2322
<property name="nunit.dllname" value="src/unit/nunit/nunit.framework.dll"/>
23+
24+
<property name="wix.build.file" value="wix/default.build" />
2425

2526
<property name="core.assemblyinfo.src" value="src/client/api/AssemblyInfo.cs.in"/>
2627
<property name="core.assemblyinfo.target" value="${gensrc.dir}/AssemblyInfo.cs"/>
@@ -30,18 +31,6 @@
3031
<property name="wcf.bin.dir" value="src/wcf/RabbitMQ.ServiceModel/bin"/>
3132
<property name="wcf.test.bin.dir" value="src/wcf/Test/bin"/>
3233

33-
<property name="wix.mergemodule.src" value="src/wix/dotnet-client-merge-module.wxs.in" />
34-
<property name="wix.mergemodule.target" value="src/wix/dotnet-client-merge-module.wxs" />
35-
<property name="wix.mergemodule.obj" value="${wix.build.dir}/rabbitmq-dotnet-client-msm.wixobj" />
36-
<property name="wix.dotnet.client.msm" value="${wix.build.dir}/rabbitmq-dotnet-client.msm" />
37-
<property name="wix.product.src" value="src/wix/dotnet-client-product.wxs.in" />
38-
<property name="wix.product.target" value="src/wix/dotnet-client-product.wxs" />
39-
<property name="wix.product.obj" value="${wix.build.dir}/rabbitmq-dotnet-client-msi.wixobj" />
40-
<property name="wix.dotnet.client.msi" value="${wix.build.dir}/rabbitmq-dotnet-client.msi" />
41-
42-
<property name="wix.localization" value="src/wix/WixUI_en-us.wxl" />
43-
<property name="wix.ui.lib" value="lib/wixui.wixlib" />
44-
4534
<property name="hg.exec" value="/usr/bin/hg" />
4635

4736
<include buildfile="local.build" />
@@ -56,7 +45,6 @@
5645
<property name="release.version.dir" value="${release.dir}/v${fullversion}"/>
5746
<property name="release.src.zip" value="${nameversion}.zip" />
5847
<property name="web.url" value="http://stage.rabbitmq.com/" />
59-
<property name="release.msi" value="${release.version.dir}/rabbitmq-dotnet-client-${fullversion}.msi" />
6048

6149
<target name="clean" description="remove all generated files"
6250
depends="clean-base,clean-wcf,clean-wix,stamp" />
@@ -79,8 +67,8 @@
7967
<delete file="${wcf.assemblyinfo.target}" failonerror="false"/> <!-- it's autogenerated -->
8068
</target>
8169

82-
<target name="clean-wix" description="remove all generated files in the .msm and .msi building process">
83-
<delete dir="${wix.build.dir}" failonerror="false" />
70+
<target name="clean-wix">
71+
<nant buildfile="${wix.build.file}" target="clean" />
8472
</target>
8573

8674
<target name="generate-assemblyinfo">
@@ -174,8 +162,7 @@
174162
<target name="stamp" description="removes the version identifier, so that the next build generates a fresh one">
175163
<delete file="${core.assemblyinfo.target}" failonerror="false" />
176164
<delete file="${wcf.assemblyinfo.target}" failonerror="false" />
177-
<delete file="${wix.mergemodule.target}" failonerror="false" />
178-
<delete file="${wix.product.target}" failonerror="false" />
165+
<nant buildfile="${wix.build.file}" target="stamp" />
179166
</target>
180167

181168
<target name="doc" description="produces HTML documentation from the code"
@@ -559,73 +546,14 @@
559546
<call target="src-dist"/>
560547
<call target="copy-deliverables"/>
561548
</target>
562-
563-
<target name="build-windows-install-msm" description="create windows installer merge module. This requires the .dll to be signed" >
549+
550+
<target name="build-windows-install-msm">
564551
<call target="dist" />
565-
<if test="${(not file::up-to-date(wix.mergemodule.src, wix.mergemodule.target))}">
566-
<delete file="${wix.mergemodule.target}" failonerror="false" />
567-
<copy file="${wix.mergemodule.src}" tofile="${wix.mergemodule.target}">
568-
<filterchain>
569-
<replacetokens>
570-
<token key="VERSION" value="${fullversion}" />
571-
</replacetokens>
572-
</filterchain>
573-
</copy>
574-
</if>
575-
<mkdir dir="${wix.build.dir}" />
576-
<exec program="candle">
577-
<arg value="-out" />
578-
<arg value="${wix.mergemodule.obj}" />
579-
<arg value="${wix.mergemodule.target}" />
580-
</exec>
581-
<exec program="light">
582-
<arg value="-out" />
583-
<arg value="${wix.dotnet.client.msm}" />
584-
<arg value="${wix.mergemodule.obj}" />
585-
</exec>
586-
</target>
587-
588-
<target name="build-windows-install-msi" description="create windows installer file. This requires the .dll to be signed">
589-
<call target="build-windows-install-msm" />
590-
<if test="${(not file::up-to-date(wix.product.src, wix.product.target))}">
591-
<delete file="${wix.product.target}" failonerror="false" />
592-
<copy file="${wix.product.src}" tofile="${wix.product.target}">
593-
<filterchain>
594-
<replacetokens>
595-
<token key="VERSION" value="${fullversion}" />
596-
</replacetokens>
597-
</filterchain>
598-
</copy>
599-
</if>
600-
<exec program="candle">
601-
<arg value="-out" />
602-
<arg value="${wix.product.obj}" />
603-
<arg value="${wix.product.target}" />
604-
</exec>
605-
<exec program="light">
606-
<arg value="-out" />
607-
<arg value="${wix.dotnet.client.msi}" />
608-
<arg value="${wix.product.obj}" />
609-
<arg value="${wix.ui.lib}" />
610-
<arg value="-loc" />
611-
<arg value="${wix.localization}" />
612-
</exec>
613-
<copy file="${wix.dotnet.client.msi}" tofile="${release.msi}" />
552+
<nant buildfile="${wix.build.file}" target="build-windows-install-msm" />
614553
</target>
615-
616-
<target name="validate-windows-install-msm" description="validate created windows installer merge module. Note: This will always output succeed. Check printed warnings and errors.">
617-
<exec program="MsiVal2.exe">
618-
<arg value="${wix.dotnet.client.msm}" />
619-
<arg value="lib/mergemod.cub" />
620-
<arg value="-f" />
621-
</exec>
622-
</target>
623-
624-
<target name="validate-windows-install-msi" description="validate created windows installer file. Note: This will always output succeed. Check printed warnings and errors.">
625-
<exec program="MsiVal2.exe">
626-
<arg value="${wix.dotnet.client.msi}" />
627-
<arg value="lib/darice.cub" />
628-
<arg value="-f" />
629-
</exec>
554+
555+
<target name="build-windows-install-msi">
556+
<call target="dist" />
557+
<nant buildfile="${wix.build.file}" target="build-windows-install-msi" />
630558
</target>
631559
</project>

‎License.rtf renamed to ‎wix/License.rtf

File renamed without changes.

‎wix/default.build

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<!-- NAnt build file. -*- nxml -*- -->
2+
<project name="RabbitMQ .NET Client Installer" default="build-windows-install-msi" basedir=".">
3+
4+
<property name="wix.build.dir" value="../build/wix" />
5+
6+
<property name="wix.mergemodule.src" value="dotnet-client-merge-module.wxs.in" />
7+
<property name="wix.mergemodule.target" value="dotnet-client-merge-module.wxs" />
8+
<property name="wix.mergemodule.obj" value="${wix.build.dir}/rabbitmq-dotnet-client-msm.wixobj" />
9+
<property name="wix.dotnet.client.msm" value="${wix.build.dir}/rabbitmq-dotnet-client.msm" />
10+
<property name="wix.product.src" value="dotnet-client-product.wxs.in" />
11+
<property name="wix.product.target" value="dotnet-client-product.wxs" />
12+
<property name="wix.product.obj" value="${wix.build.dir}/rabbitmq-dotnet-client-msi.wixobj" />
13+
<property name="wix.dotnet.client.msi" value="${wix.build.dir}/rabbitmq-dotnet-client.msi" />
14+
15+
<property name="wix.localization" value="WixUI_en-us.wxl" />
16+
<property name="wix.ui.lib" value="../lib/wixui.wixlib" />
17+
18+
<property name="release.msi" value="../${release.version.dir}/rabbitmq-dotnet-client-${fullversion}.msi" />
19+
20+
<target name="clean" description="remove all generated files in the .msm and .msi building process">
21+
<delete dir="${wix.build.dir}" failonerror="false" />
22+
</target>
23+
24+
<target name="stamp">
25+
<delete file="${wix.mergemodule.target}" failonerror="false" />
26+
<delete file="${wix.product.target}" failonerror="false" />
27+
</target>
28+
29+
<target name="build-windows-install-msm" description="create windows installer merge module. This requires the .dll to be signed" >
30+
<if test="${(not file::up-to-date(wix.mergemodule.src, wix.mergemodule.target))}">
31+
<delete file="${wix.mergemodule.target}" failonerror="false" />
32+
<copy file="${wix.mergemodule.src}" tofile="${wix.mergemodule.target}">
33+
<filterchain>
34+
<replacetokens>
35+
<token key="VERSION" value="${fullversion}" />
36+
</replacetokens>
37+
</filterchain>
38+
</copy>
39+
</if>
40+
<mkdir dir="${wix.build.dir}" />
41+
<exec program="candle">
42+
<arg value="-out" />
43+
<arg value="${wix.mergemodule.obj}" />
44+
<arg value="${wix.mergemodule.target}" />
45+
</exec>
46+
<exec program="light">
47+
<arg value="-out" />
48+
<arg value="${wix.dotnet.client.msm}" />
49+
<arg value="${wix.mergemodule.obj}" />
50+
</exec>
51+
</target>
52+
53+
<target name="build-windows-install-msi" description="create windows installer file. This requires the .dll to be signed">
54+
<call target="build-windows-install-msm" />
55+
<if test="${(not file::up-to-date(wix.product.src, wix.product.target))}">
56+
<delete file="${wix.product.target}" failonerror="false" />
57+
<copy file="${wix.product.src}" tofile="${wix.product.target}">
58+
<filterchain>
59+
<replacetokens>
60+
<token key="VERSION" value="${fullversion}" />
61+
</replacetokens>
62+
</filterchain>
63+
</copy>
64+
</if>
65+
<exec program="candle">
66+
<arg value="-out" />
67+
<arg value="${wix.product.obj}" />
68+
<arg value="${wix.product.target}" />
69+
</exec>
70+
<exec program="light">
71+
<arg value="-out" />
72+
<arg value="${wix.dotnet.client.msi}" />
73+
<arg value="${wix.product.obj}" />
74+
<arg value="${wix.ui.lib}" />
75+
<arg value="-loc" />
76+
<arg value="${wix.localization}" />
77+
</exec>
78+
<copy file="${wix.dotnet.client.msi}" tofile="${release.msi}" />
79+
</target>
80+
81+
<target name="validate-windows-install-msm" description="validate created windows installer merge module. Note: This will always output succeed. Check printed warnings and errors.">
82+
<exec program="MsiVal2.exe">
83+
<arg value="${wix.dotnet.client.msm}" />
84+
<arg value="../lib/mergemod.cub" />
85+
<arg value="-f" />
86+
</exec>
87+
</target>
88+
89+
<target name="validate-windows-install-msi" description="validate created windows installer file. Note: This will always output succeed. Check printed warnings and errors.">
90+
<exec program="MsiVal2.exe">
91+
<arg value="${wix.dotnet.client.msi}" />
92+
<arg value="../lib/darice.cub" />
93+
<arg value="-f" />
94+
</exec>
95+
</target>
96+
</project>

‎wix/dotnet-client-merge-module.wxs.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
<Directory Id='TARGETDIR' Name='SourceDir'>
77
<Component Id='ClientLibrary' Guid='06543EE8-DED2-4C1C-826E-6AAE0B403AF3'>
8-
<File Id='RabbitMQClientDll' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes' Source='build\bin\RabbitMQ.Client.dll' />
8+
<File Id='RabbitMQClientDll' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes' Source='..\build\bin\RabbitMQ.Client.dll' />
99
</Component>
1010

1111
<Directory Id='ExamplesFolder' Name='examples'>
12-
<Directory Id='BinExamplesFolder' Name='bin' FileSource='build\bin'>
12+
<Directory Id='BinExamplesFolder' Name='bin' FileSource='..\build\bin'>
1313
<Component Id='ExampleBinaries' Guid='1C270D1C-CD79-49D8-9413-E6211F52B5A8'>
1414
<File Id='AddClientExe' Name='AddClnt.exe' LongName='AddClient.exe' Vital='yes' />
1515
<File Id='AddServerExe' Name='AddServ.exe' LongName='AddServer.exe' Vital='yes' />
@@ -23,7 +23,7 @@
2323
</Component>
2424
</Directory>
2525

26-
<Directory Id='SrcExamplesFolder' Name='src' FileSource='src\examples'>
26+
<Directory Id='SrcExamplesFolder' Name='src' FileSource='..\src\examples'>
2727
<Component Id='ExampleSources' Guid='962896C3-D476-4C8E-B5F3-BE963D566A49'>
2828
<File Id='AddClientCs' Name='AddClnt.cs' LongName='AddClient.cs' Vital='yes' />
2929
<File Id='AddServerCs' Name='AddServ.cs' LongName='AddServer.cs' Vital='yes' />
@@ -45,7 +45,7 @@
4545
</Directory>
4646

4747
<Directory Id='DocFolder' Name='doc'>
48-
<Directory Id='HtmlFolder' Name='html' FileSource='build\doc\html\'>
48+
<Directory Id='HtmlFolder' Name='html' FileSource='..\build\doc\html\'>
4949
<Component Id='HtmlApiDocumentation' Guid='7B03679B-9677-4679-AE2B-1F70E7D92B45'>
5050
<!--
5151
The following was generated using
@@ -149,7 +149,7 @@
149149
</Component>
150150
</Directory>
151151

152-
<Directory Id='PdfFolder' Name='pdf' FileSource='releases\rabbitmq-dotnet-client\v@VERSION@\'>
152+
<Directory Id='PdfFolder' Name='pdf' FileSource='..\releases\rabbitmq-dotnet-client\v@VERSION@\'>
153153
<Component Id='PdfApiDocumentation' Guid='018D0FDF-9B7F-4C44-9072-A1030336B076'>
154154
<File Id='ApiGuidePdf' Name='apiguide.pdf' LongName='rabbitmq-dotnet-client-@[email protected]' Vital='yes'>
155155
<Shortcut Id='PdfApiDocShortcut' Directory='DOTNET_CLIENT_MENU_DIR' Name='ApiPdf' LongName='Autogenerated API documentation (PDF)' />

‎wix/dotnet-client-product.wxs.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Directory Id='ProgramFilesFolder' Name='PFiles'>
1717
<Directory Id='RabbitMQFolder' Name='RabbitMQ'>
1818
<Directory Id='DOTNET_CLIENT_INSTALLDIR' Name='DNClient' LongName='DotNetClient'>
19-
<Merge Id='DotNetClientModule' Language='1033' SourceFile='build\wix\rabbitmq-dotnet-client.msm' DiskId='1' />
19+
<Merge Id='DotNetClientModule' Language='1033' SourceFile='..\build\wix\rabbitmq-dotnet-client.msm' DiskId='1' />
2020
</Directory>
2121
</Directory>
2222
</Directory>
@@ -28,6 +28,6 @@
2828

2929
<UIRef Id='WixUI_FeatureTree' />
3030
<UIRef Id='WixUI_ErrorProgressText' />
31-
<Binary Id="wixca" src="lib\wixca.dll"/>
31+
<Binary Id="wixca" src="..\lib\wixca.dll"/>
3232
</Product>
3333
</Wix>

0 commit comments

Comments
 (0)