Mercurial > hg > sonic-visualiser

changeset 1786:49e9bacd0924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deployment updates for win32/win64. Next version will be 3.1.
author Chris Cannam
date Fri, 20 Apr 2018 16:35:48 +0100
parents c4be203b506d
children f14477151a3f
files .hgignore deploy/win32/README-Vamp.txt deploy/win32/build.cmd deploy/win32/sonic-visualiser.wxs deploy/win64/README-Vamp.txt deploy/win64/README-Vamp32.txt deploy/win64/build.cmd deploy/win64/sonic-visualiser.wxs version.h vext-lock.json
diffstat 10 files changed, 46 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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.
--- 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
--- 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 @@
             <File
                 Id="README"
                 Name="README.txt"
-                Source="..\sonic-visualiser\README"/>
+                Source="..\sonic-visualiser\README.md"/>
             <File
                 Id="CHANGELOG"
                 Name="CHANGELOG.txt"
--- a/deploy/win64/README-Vamp.txt	Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win64/README-Vamp.txt	Fri Apr 20 16:35:48 2018 +0100
@@ -1,5 +1,8 @@
 
-To add Vamp audio analysis plugins to the Transform menu in
+To add 64-bit Vamp audio analysis plugins to the Transform menu in
 Sonic Visualiser, unpack and copy them into this directory.
 
+(For 32-bit plugins, put them in "C:\Program Files (x86)\Vamp Plugins"
+instead, or the equivalent in your local language edition of Windows.)
+
 See http://vamp-plugins.org/ for more information.
--- a/deploy/win64/README-Vamp32.txt	Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win64/README-Vamp32.txt	Fri Apr 20 16:35:48 2018 +0100
@@ -2,4 +2,7 @@
 To add 32-bit Vamp audio analysis plugins to the Transform menu in
 Sonic Visualiser, unpack and copy them into this directory.
 
+(For 64-bit plugins, put them in "C:\Program Files\Vamp Plugins"
+instead, or the equivalent in your local language edition of Windows.)
+
 See http://vamp-plugins.org/ for more information.
--- a/deploy/win64/build.cmd	Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win64/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_MSVC2015_64bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_10_1_MSVC2017_64bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
 PAUSE
 DEL sonic-visualiser.wixobj
 DEL sonic-visualiser.wixpdb
--- a/deploy/win64/sonic-visualiser.wxs	Thu Apr 19 14:41:42 2018 +0100
+++ b/deploy/win64/sonic-visualiser.wxs	Fri Apr 20 16:35:48 2018 +0100
@@ -1,11 +1,15 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
+  <!-- NB this is specific to a particular Qt and compiler version.
+       20th April 2018 - updated for Qt 5.10.1 and MSVC 2017
+   -->
+
   <Product
       Name="Sonic Visualiser" 
       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 +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 @@
             <File
                 Id="README"
                 Name="README.txt"
-                Source="..\sonic-visualiser\README"/>
+                Source="..\sonic-visualiser\README.md"/>
             <File
                 Id="CHANGELOG"
                 Name="CHANGELOG.txt"
@@ -156,20 +160,20 @@
                <File
                    Id="concrt140"
                    Name="concrt140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\concrt140.DLL"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\concrt140.DLL"
                    KeyPath="yes"/>
                <File
                    Id="msvcp140"
                    Name="msvcp140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
                <File
                    Id="vccorlib140"
                    Name="vccorlib140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vccorlib140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
                <File
                    Id="vcruntime140"
                    Name="vcruntime140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
           </Component>
 
 	  <Directory Id="Platforms" Name="platforms">
@@ -241,6 +245,19 @@
 	</Directory> <!-- sv -->
       </Directory> <!-- pfiles64 -->
 
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="Vamp32Plugins" Name="Vamp Plugins">
+          <Component
+              Id="Vamp32Plugins"
+              Guid="62d23999-63ed-4937-b904-ec8e47a776d1">
+            <File
+                Id="Vamp32README"
+                Name="README.txt"
+                Source="..\sonic-visualiser\deploy\win64\README-Vamp32.txt"/>
+          </Component>
+        </Directory>
+      </Directory>
+
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="Sonic Visualiser">
           <Component Id="ProgramMenuDir" Guid="C1980FF3-D135-46F8-8542-F937748721E6">
@@ -273,6 +290,7 @@
       <ComponentRef Id="Piper32"/>
       <ComponentRef Id="Checker64"/>
       <ComponentRef Id="Checker32"/>
+      <ComponentRef Id="Vamp32Plugins"/>
       <ComponentRef Id="ProgramMenuDir"/>
     </Feature>
 
--- a/version.h	Thu Apr 19 14:41:42 2018 +0100
+++ b/version.h	Fri Apr 20 16:35:48 2018 +0100
@@ -1,1 +1,1 @@
-#define SV_VERSION "3.0.4"
+#define SV_VERSION "3.1"
--- a/vext-lock.json	Thu Apr 19 14:41:42 2018 +0100
+++ b/vext-lock.json	Fri Apr 20 16:35:48 2018 +0100
@@ -28,7 +28,7 @@
       "pin": "3c9de9e7f6e8"
     },
     "bqfft": {
-      "pin": "81b50ec12d9a"
+      "pin": "daa5e8333dfe"
     },
     "bqresample": {
       "pin": "a9a5555d9b6d"