Mercurial > hg > sonic-visualiser

changeset 1593:ecdb78d5549a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Tue, 21 Feb 2017 21:10:15 +0000
parents 2db9579bef3b (diff) b321e3c78fa2 (current diff)
children 376234554d17
files .hgsubstate
diffstat 4 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Feb 21 17:53:51 2017 +0000
+++ b/.hgsubstate	Tue Feb 21 21:10:15 2017 +0000
@@ -8,6 +8,6 @@
 328ffacfc70e50fb78cad0c28d3c32851d40e04d piper-cpp
 95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds
 0bb2ec333d3b56a43f89cf03040492101ce19d54 svapp
-96a6ea30933e264b57b9f5b1784430b54432bf15 svcore
+0a729b57b4e4cc7f8e2fcec446de529344c9041f svcore
 a496986aa61bc96c63338928cf26e29ad773ff61 svgui
 8701366604c7d23fdcf13b9732cb92debec65b19 vamp-plugin-sdk
--- a/deploy/win32/build.cmd	Tue Feb 21 17:53:51 2017 +0000
+++ b/deploy/win32/build.cmd	Tue Feb 21 21:10:15 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	Tue Feb 21 17:53:51 2017 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Tue Feb 21 21:10:15 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	Tue Feb 21 17:53:51 2017 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Tue Feb 21 21:10:15 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>