updated Windows installer with correct WiX command lines

sounds-mathers · Jan 29, 2015 · d1f52ec · d1f52ec
1 parent c12bad0
commit d1f52ec
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/app/gui/qt/sonic-pi.wxs b/app/gui/qt/sonic-pi.wxs
@@ -2,17 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:firewall="http://schemas.microsoft.com/wix/FirewallExtension">
 <!-- so you want to be a WiXard?
 
-heat dir etc -gg -g1 -sfrag -dir SonicPi -cg ETC -out etc.wxs 
-heat dir etc -gg -g1 -sfrag -dir AppDir -cg GUI -out gui.wxs 
-heat dir etc -gg -g1 -sfrag -dir AppDir -cg SERVER -out server.wxs 
-edit sonic-pi.wxs
-    change version number
-edit gui.wxs
-    remove sonic-pi.exe component and componentref
-edit server.wxs
-	remove scsynth.exe component and componentref
-candle sonic-pi.wxs etc.wxs gui.wxs server.wxs -ext WixUtilExtension -ext WixFirewallExtension
-light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj -ext WixUtilExtension -ext WixUIExtension -ext WixFirewallExtension -o Sonic-Pi.msi -b etc -b app\gui -b app\server
+> heat dir etc -gg -g1 -sfrag -dr SonicPi -cg ETC -out etc.wxs 
+> heat dir etc -gg -g1 -sfrag -dr AppDir -cg GUI -out gui.wxs 
+> heat dir etc -gg -g1 -sfrag -dr AppDir -cg SERVER -out server.wxs 
+> candle sonic-pi.wxs etc.wxs gui.wxs server.wxs -ext WixUtilExtension -ext WixFirewallExtension
+> light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj -ext WixUtilExtension -ext WixUIExtension -ext WixFirewallExtension -o Sonic-Pi.msi -b etc -b app\gui -b app\server
 
 -->
     <Product Id="*" Name="Sonic Pi" Language="1033" Version="2.3" Manufacturer="Sonic Pi" UpgradeCode="ECA5D03B-CEBD-4672-A0A2-176CBCBA4429">
@@ -23,8 +17,8 @@ light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj -ext WixUtilExtension
             <Directory Id="ProgramFilesFolder" Name="PFiles">
                 <Directory Id="SonicPi" Name="Sonic Pi">
 					<Directory Id="AppDir" Name="app">
-                        <Directory Id="GUI" Name="gui">
-                            <Directory Id="QT" Name="qt">
+                        <Directory Id="GuiDir" Name="gui">
+                            <Directory Id="QtDir" Name="qt">
                                 <Directory Id="RELEASE" Name="release">
                                     <Component Id="SONIC_PI.EXE" DiskId="1" Guid="BA4C72F9-C198-436A-B1E2-B2DF8EC65960">
                                         <File Id="SONIC_PI.EXE" Name="sonic-pi.exe" Source="SourceDir\app\gui\qt\release\sonic-pi.exe" />
@@ -34,9 +28,9 @@ light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj -ext WixUtilExtension
 								</Directory>
 							</Directory>
 						</Directory>
-						<Directory Id="SERVER" Name="server">
-							<Directory Id="NATIVE" Name="native">
-								<Directory Id="WINDOWS" Name="windows">
+						<Directory Id="ServerDir" Name="server">
+							<Directory Id="NativeDir" Name="native">
+								<Directory Id="NativeWindowsDir" Name="windows">
                                     <Component Id="SCSYNTH.EXE" DiskId="1" Guid="AE2F1766-69A6-4EFB-9DAE-E11A2BD717F5">
                                         <File Id="SCSYNTH.EXE" Name="scsynth.exe" Source="SourceDir\app\server\native\windows\scsynth.exe" />
                                     </Component>