Unzip binaries, correct their locations in Wix files

Author: michaelklishin

dist-msi.sh

@@ -60,6 +60,7 @@ NAME_VSN=$NAME-$RABBIT_VSN
 RELEASE_DIR=release
 
 function main {
+    get-binaries
     get-sources
     gen-license-rtf
 
@@ -107,6 +108,9 @@ function get-sources {
     cp $RELEASE_DIR/$NAME_VSN-user-guide.pdf tmp/unzip/
 }
 
+function get-binaries {
+    unzip -q $RELEASE_DIR/$NAME_VSN.zip -d tmp/unzip/$NAME_VSN
+}
 
 function gen-wxs {
     set +x

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
     <Module Id='DotNetClientModule' Guid='97DB49A3-B75E-4AE1-B01A-DFC8E335F866' Language='1033' Codepage='1252' Version='@VERSION@'>
-        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='GoPivotal, Inc.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='GoPivotal, Inc.'
+                 InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
         <!-- VERSION is the RabbitMQ release version. This might differ
              from the RabbitMQ.Client.dll version (which always has 4
              components). -->
@@ -14,15 +15,19 @@
                  (i.e. will only have to be specified once, with Assembly='.net'
                  in order to be copied in both places). -->
             <Component Id='ClientLibraryAssembly' Guid='06543EE8-DED2-4C1C-826E-6AAE0B403AF3'>
-                <File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
+                <File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes'
+                      Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
             </Component>
 
             <Directory Id='BinFolder' Name='bin'>
                 <Component Id='ClientLibraryBin' Guid='83A1DE00-CCB6-42C2-BD14-FBAEDDBC50E8'>
                     <CreateFolder />
-                    <File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
-                    <File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.xml' />
-                    <Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall' Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
+                    <File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes'
+                          Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
+                    <File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes'
+                          Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.xml' />
+                    <Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall'
+                              Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
                         <Registry Id='RabbitMQAssemblyFolderRegVal' Action='write' Type='string' Value='[BinFolder]' />
                     </Registry>
                 </Component>