# HG changeset patch
# User Chris Cannam
# Date 1524238548 -3600
# Node ID 49e9bacd0924016cf4a48c438f23512a7cf5cb76
# Parent c4be203b506ddb57559f44e16b6ae016bc35f101
Deployment updates for win32/win64. Next version will be 3.1.
diff -r c4be203b506d -r 49e9bacd0924 .hgignore
--- a/.hgignore Thu Apr 19 14:41:42 2018 +0100
+++ b/.hgignore Fri Apr 20 16:35:48 2018 +0100
@@ -49,3 +49,5 @@
piper-convert
.vext*
glob:.vext-*.bin
+*.msi
+*.user
diff -r c4be203b506d -r 49e9bacd0924 deploy/win32/README-Vamp.txt
--- a/deploy/win32/README-Vamp.txt Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win32/README-Vamp.txt Fri Apr 20 16:35:48 2018 +0100
@@ -1,5 +1,5 @@
-To add Vamp audio analysis plugins to the Transform menu in
+To add 32-bit Vamp audio analysis plugins to the Transform menu in
Sonic Visualiser, unpack and copy them into this directory.
See http://vamp-plugins.org/ for more information.
diff -r c4be203b506d -r 49e9bacd0924 deploy/win32/build.cmd
--- a/deploy/win32/build.cmd Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win32/build.cmd Fri Apr 20 16:35:48 2018 +0100
@@ -1,11 +1,11 @@
@ECHO OFF
-SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.9\bin"
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.11\bin"
IF NOT EXIST %WIXPATH% (
- SET WIXPATH="C:\Program Files\WiX Toolset v3.9\bin"
+ SET WIXPATH="C:\Program Files\WiX Toolset v3.11\bin"
)
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 -ext WixUtilExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_10_1_MinGW_32bit-Release -ext WixUIExtension -ext WixUtilExtension -v sonic-visualiser.wixobj
PAUSE
DEL sonic-visualiser.wixobj
DEL sonic-visualiser.wixpdb
diff -r c4be203b506d -r 49e9bacd0924 deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win32/sonic-visualiser.wxs Fri Apr 20 16:35:48 2018 +0100
@@ -5,7 +5,7 @@
Id="*"
Language="1033"
Codepage="1252"
- Version="3.0.3"
+ Version="3.1"
UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
Manufacturer="Queen Mary, University of London">
@@ -13,7 +13,7 @@
Id="*"
Keywords="Installer"
Description="Sonic Visualiser 32-bit Installer"
- Comments="Copyright (c) 2017 Queen Mary, University of London and others."
+ Comments="Copyright (c) 2018 Queen Mary, University of London and others."
Manufacturer="Queen Mary, University of London"
InstallerVersion="100"
Languages="1033"
@@ -76,7 +76,7 @@
+ Source="..\sonic-visualiser\README.md"/>
+
+
@@ -13,7 +17,7 @@
Id="*"
Keywords="Installer"
Description="Sonic Visualiser 64-bit Installer"
- Comments="Copyright (c) 2017 Queen Mary, University of London and others."
+ Comments="Copyright (c) 2018 Queen Mary, University of London and others."
Manufacturer="Queen Mary, University of London"
InstallerVersion="200"
Languages="1033"
@@ -77,7 +81,7 @@
+ Source="..\sonic-visualiser\README.md"/>
+ Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
+ Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
+ Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
@@ -241,6 +245,19 @@
+
+
+
+
+
+
+
+