# HG changeset patch
# User Chris Cannam
# Date 1483738713 0
# Node ID dc198449dc82e025f018f8e3072c3b26dcc4300f
# Parent  577a900a98f3bd9be068c3eb20126cd2789be94a
Stub win64 deploy, + ogg testfiles

diff -r 577a900a98f3 -r dc198449dc82 .hgsubstate
--- a/.hgsubstate	Fri Jan 06 21:04:53 2017 +0000
+++ b/.hgsubstate	Fri Jan 06 21:38:33 2017 +0000
@@ -8,6 +8,6 @@
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 af97cad61ff0a443cdf4a33a4ac867431dadaaae sv-dependency-builds
 1a8a8980f39a8e735c90837a4c2260248aafe7f1 svapp
-1bc6f70cb4c787ebc2ba18c67e6153c9753574f8 svcore
+9fb01c914935d548b7969ca29e52c434658fc46e svcore
 be42a33a3db6c11559166b65c30bcd7248a46c9f svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
diff -r 577a900a98f3 -r dc198449dc82 deploy/win32/README-Vamp.txt
--- a/deploy/win32/README-Vamp.txt	Fri Jan 06 21:04:53 2017 +0000
+++ b/deploy/win32/README-Vamp.txt	Fri Jan 06 21:38:33 2017 +0000
@@ -1,5 +1,5 @@
 
 To add Vamp audio analysis plugins to the Transform menu in
-Sonic Visualiser, unpack them into this directory.
+Sonic Visualiser, unpack and copy them into this directory.
 
 See http://vamp-plugins.org/ for more information.
diff -r 577a900a98f3 -r dc198449dc82 deploy/win64/License.rtf
Binary file deploy/win64/License.rtf has changed
diff -r 577a900a98f3 -r dc198449dc82 deploy/win64/README-Vamp.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/README-Vamp.txt	Fri Jan 06 21:38:33 2017 +0000
@@ -0,0 +1,5 @@
+
+To add 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 577a900a98f3 -r dc198449dc82 deploy/win64/build.cmd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/build.cmd	Fri Jan 06 21:38:33 2017 +0000
@@ -0,0 +1,11 @@
+@ECHO OFF
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.9\bin"
+IF NOT EXIST %WIXPATH% (
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.9\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
+PAUSE
+DEL sonic-visualiser.wixobj
+DEL sonic-visualiser.wixpdb
diff -r 577a900a98f3 -r dc198449dc82 deploy/win64/sonic-visualiser.wxs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Fri Jan 06 21:38:33 2017 +0000
@@ -0,0 +1,243 @@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <Product
+      Name="Sonic Visualiser" 
+      Id="*"
+      Language="1033"
+      Codepage="1252" 
+      Version="3.0.0"
+      UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
+      Manufacturer="Queen Mary, University of London">
+    
+    <Package
+        Id="*"
+        Keywords="Installer"
+        Description="Sonic Visualiser Installer" 
+        Comments="Copyright (c) 2017 Queen Mary, University of London and others."
+        Manufacturer="Queen Mary, University of London" 
+        InstallerVersion="100" 
+        Languages="1033" 
+        Compressed="yes" 
+        SummaryCodepage="1252"/>
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of Sonic Visualiser is already installed. Setup will now exit."/>
+
+    <Media Id="1" Cabinet="SonicVisualiser.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+    <Property Id="DiskPrompt" Value="Sonic Visualiser Installation [1]"/>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="VampPlugins" Name="Vamp Plugins">
+            <Component
+                Id="VampPlugins"
+                Guid="E68E4E0B-3C63-49bd-AD2D-44431EABDA6A">
+                <File
+                    Id="VampREADME"
+                    Name="README.txt"
+                    DiskId="1"
+                    Source="..\sonic-visualiser\deploy\win64\README-Vamp.txt"/>
+            </Component>
+        </Directory>
+        <Directory Id="APPLICATIONFOLDER" Name="Sonic Visualiser">
+            
+            <Component
+                Id="MainExecutable"
+                Guid="2C02DFB7-3CDF-4F73-B9D1-846326EE417D">
+
+              <File
+                  Id="SVExecutable"
+                  Name="Sonic Visualiser.exe"
+                  DiskId="1"
+                  Source="release\Sonic Visualiser.exe"
+                  KeyPath="yes">
+
+                <Shortcut
+                    Id="SVStartEntry"
+                    Directory="ProgramMenuDir"
+                    Name="Sonic Visualiser"
+                    WorkingDirectory="APPLICATIONFOLDER"
+                    Icon="winicon.ico"
+                    IconIndex="0"
+                    Advertise="yes"/>
+
+                <Shortcut
+                    Id="SVDesktop"
+                    Directory="DesktopFolder"
+                    Name="Sonic Visualiser"
+                    WorkingDirectory="APPLICATIONFOLDER"
+                    Icon="winicon.ico"
+                    IconIndex="0"
+                    Advertise="yes"/>
+              </File>
+
+              <File
+                  Id="COPYING"
+                  Name="COPYING"
+                  DiskId="1"
+                  Source="COPYING"/>
+              <File
+                  Id="README"
+                  Name="README"
+                  DiskId="1"
+                  Source="README"/>
+              <File
+                  Id="CHANGELOG"
+                  Name="CHANGELOG"
+                  DiskId="1"
+                  Source="CHANGELOG"/>
+
+              <File
+                  Id="winicon.ico"
+                  Name="sv-winicon.ico"
+                  DiskId="1"
+                  Source="icons/sv-winicon.ico"/>
+            </Component>
+            
+            <Component
+              Id="SVFileAssociation"
+              Guid="DC6B3DD1-46DE-47FC-90FB-D8ACD5D1A88A">
+              
+              <ProgId 
+                Id='SonicVisualiser.svfile' 
+                Description='Sonic Visualiser project file'
+                Icon="SVExecutable">
+                <Extension 
+                  Id='sv' 
+                  ContentType='application/sonicvisualiser'>
+                  <Verb 
+                    Id='open' 
+                    Command='Open' 
+                    TargetFile='SVExecutable' 
+                    Argument='"%1"' />
+                </Extension>
+              </ProgId>
+              
+            </Component>
+            
+            <Component
+                Id="Qt5"
+                Guid="316341D4-B7B2-411D-BCCE-879A11D5709F">
+              <File
+                  Id="QtCore"
+                  Name="Qt5Core.dll"
+                  DiskId="1"
+                  Source="release\Qt5Core.dll"
+		  KeyPath="yes"/>
+              <File
+                  Id="QtGui"
+                  Name="Qt5Gui.dll"
+                  DiskId="1"
+                  Source="release\Qt5Gui.dll"/>
+              <File
+                  Id="QtNetwork"
+                  Name="Qt5Network.dll"
+                  DiskId="1"
+                  Source="release\Qt5Network.dll"/>
+              <File
+                  Id="QtWidgets"
+                  Name="Qt5Widgets.dll"
+                  DiskId="1"
+                  Source="release\Qt5Widgets.dll"/>
+              <File
+                  Id="QtXml"
+                  Name="Qt5Xml.dll"
+                  DiskId="1"
+                  Source="release\Qt5Xml.dll"/>
+              <File
+                  Id="icudt53"
+                  Name="icudt53.dll"
+                  DiskId="1"
+                  Source="release\icudt53.dll"/>
+              <File
+                  Id="icuin53"
+                  Name="icuin53.dll"
+                  DiskId="1"
+                  Source="release\icuin53.dll"/>
+              <File
+                  Id="icuuc53"
+                  Name="icuuc53.dll"
+                  DiskId="1"
+                  Source="release\icuuc53.dll"/>
+              <File
+                  Id="libgcc"
+                  Name="libgcc_s_dw2-1.dll"
+                  DiskId="1"
+                  Source="release\libgcc_s_dw2-1.dll"/>
+              <File
+                  Id="libstdcplusplus"
+                  Name="libstdc++-6.dll"
+                  DiskId="1"
+                  Source="release\libstdc++-6.dll"/>
+              <File
+                  Id="libwinpthread"
+                  Name="libwinpthread-1.dll"
+                  DiskId="1"
+                  Source="release\libwinpthread-1.dll"/>
+            </Component>
+	    
+	    <Directory Id="Platforms" Name="platforms">
+              <Component
+                  Id="Qt5PlatformPlugins"
+                  Guid="1EDCEA4B-C83F-430B-B09D-CB113DFD4E77">
+		<File
+                    Id="qminimal"
+                    Name="qminimal.dll"
+                    DiskId="1"
+                    Source="release\qminimal.dll"/>
+		<File
+                    Id="qwindows"
+                    Name="qwindows.dll"
+                    DiskId="1"
+                    Source="release\qwindows.dll"/>
+              </Component>
+	    </Directory>
+
+        </Directory>
+      </Directory>
+      
+      <Directory Id="ProgramMenuFolder" Name="Programs">
+        <Directory Id="ProgramMenuDir" Name="Sonic Visualiser">
+          <Component Id="ProgramMenuDir" Guid="C1980FF3-D135-46F8-8542-F937748721E6">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+
+      <Directory Id="DesktopFolder" Name="Desktop"/>
+
+    </Directory>
+
+    <Feature 
+      Id="Complete"
+      Title="Required files"
+      Description="Installs the required files for running Sonic Visualiser."
+      AllowAdvertise="no"
+      Absent="disallow"
+      ConfigurableDirectory="APPLICATIONFOLDER"
+      Level="1">
+      <ComponentRef Id="VampPlugins"/>
+      <ComponentRef Id="MainExecutable"/>
+      <ComponentRef Id="SVFileAssociation"/>
+      <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="Qt5PlatformPlugins"/>
+      <ComponentRef Id="ProgramMenuDir"/>
+    </Feature>
+
+    <UI>
+      <UIRef Id="WixUI_InstallDir" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+    <Property Id="WIXUI_DONTVALIDATEPATH" Value="1" />
+    <Property Id="ApplicationFolderName" Value="Sonic Visualiser" />
+    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+    
+    <Icon Id="winicon.ico" SourceFile="icons/sv-winicon.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
+        
+  </Product>
+</Wix>
+