Mercurial > hg > sonic-visualiser

changeset 1591:9ed29d67c10e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add background images to win32 installer as well
author Chris Cannam
date Tue, 21 Feb 2017 21:07:14 +0000
parents 881d7f99bba3
children 2db9579bef3b
files deploy/win32/build.cmd deploy/win32/sonic-visualiser.wxs deploy/win64/sonic-visualiser.wxs
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/win32/build.cmd	Wed Feb 08 13:57:04 2017 +0000
+++ b/deploy/win32/build.cmd	Tue Feb 21 21:07:14 2017 +0000
@@ -5,7 +5,7 @@
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
-%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MinGW_32bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MinGW_32bit-Release -ext WixUIExtension -ext WixUtilExtension -v sonic-visualiser.wixobj
 PAUSE
 DEL sonic-visualiser.wixobj
 DEL sonic-visualiser.wixpdb
--- a/deploy/win32/sonic-visualiser.wxs	Wed Feb 08 13:57:04 2017 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Tue Feb 21 21:07:14 2017 +0000
@@ -245,7 +245,14 @@
     
     <Icon Id="winicon.ico" SourceFile="..\sonic-visualiser\icons\sv-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
-    
+<!--
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Sonic Visualiser now"/>
+    <Property Id="WixShellExecTarget" Value="[#SVExecutable]"/>
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes"/>
+-->
+    <WixVariable Id="WixUIBannerBmp" Value="..\sonic-visualiser\deploy\win32\top.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="..\sonic-visualiser\deploy\win32\main.bmp"/>
+
   </Product>
 </Wix>
 
--- a/deploy/win64/sonic-visualiser.wxs	Wed Feb 08 13:57:04 2017 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Tue Feb 21 21:07:14 2017 +0000
@@ -289,7 +289,10 @@
     
     <Icon Id="winicon.ico" SourceFile="..\sonic-visualiser\icons\sv-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
-    
+
+    <WixVariable Id="WixUIBannerBmp" Value="..\sonic-visualiser\deploy\win32\top.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="..\sonic-visualiser\deploy\win32\main.bmp"/>
+
   </Product>
 </Wix>