Mercurial > hg > sonic-visualiser
changeset 1497:60d6c21aec84 3.0-integration
More of an effort at 64-bit Win installer
author | Chris Cannam |
---|---|
date | Sun, 08 Jan 2017 16:33:20 +0000 (2017-01-08) |
parents | 1f326b7fb69a |
children | ffad03335920 |
files | deploy/win64/README-Vamp32.txt deploy/win64/sonic-visualiser.wxs |
diffstat | 2 files changed, 189 insertions(+), 154 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/win64/README-Vamp32.txt Sun Jan 08 16:33:20 2017 +0000 @@ -0,0 +1,5 @@ + +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/win64/sonic-visualiser.wxs Sun Jan 08 16:10:28 2017 +0000 +++ b/deploy/win64/sonic-visualiser.wxs Sun Jan 08 16:33:20 2017 +0000 @@ -12,7 +12,7 @@ <Package Id="*" Keywords="Installer" - Description="Sonic Visualiser Installer" + Description="Sonic Visualiser 64-bit Installer" Comments="Copyright (c) 2017 Queen Mary, University of London and others." Manufacturer="Queen Mary, University of London" InstallerVersion="100" @@ -26,174 +26,200 @@ <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> + <Component + Id="VampPlugins" + Guid="E68E4E0B-3C63-49bd-AD2D-44431EABDA6A"> + <File + Id="VampREADME" + Name="README.txt" + Source="..\sonic-visualiser\deploy\win64\README-Vamp32.txt"/> + </Component> </Directory> + </Directory> <!-- pfiles --> + + <Directory Id="ProgramFiles64Folder" Name="PFiles64"> + <Directory Id="VampPlugins" Name="Vamp Plugins"> + <Component + Id="VampPlugins" + Guid="528C7D7E-5A06-4E7D-89BB-7C16431DF82F"> + <File + Id="VampREADME" + Name="README.txt" + Source="..\sonic-visualiser\deploy\win64\README-Vamp.txt"/> + </Component> + </Directory> + <Directory Id="APPLICATIONFOLDER" Name="Sonic Visualiser"> + <Component + Id="MainExecutable" + Guid="65E1EBDF-4C8F-47B8-BCD6-981667F5946D"> + + <File + Id="SVExecutable" + Name="Sonic Visualiser.exe" + 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.txt" + Source="COPYING"/> + <File + Id="README" + Name="README.txt" + Source="README"/> + <File + Id="CHANGELOG" + Name="CHANGELOG.txt" + Source="CHANGELOG"/> + + <File + Id="winicon.ico" + Name="sv-winicon.ico" + Source="icons/sv-winicon.ico"/> + </Component> + + <Component + Id="SVFileAssociation" + Guid="F07C5CC1-0209-4C1A-8D52-C40B50A2B964"> - <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 + <ProgId Id='SonicVisualiser.svfile' Description='Sonic Visualiser project file' Icon="SVExecutable"> - <Extension + <Extension Id='sv' ContentType='application/sonicvisualiser'> - <Verb + <Verb Id='open' Command='Open' TargetFile='SVExecutable' Argument='"%1"' /> - </Extension> - </ProgId> - + </Extension> + </ProgId> + + </Component> + + <Component + Id="Qt5" + Guid="5495ED5E-939A-4BE8-9000-D55F2A7A2E90"> + <File + Id="QtCore" + Name="Qt5Core.dll" + Source="release\Qt5Core.dll" + KeyPath="yes"/> + <File + Id="QtGui" + Name="Qt5Gui.dll" + Source="release\Qt5Gui.dll"/> + <File + Id="QtNetwork" + Name="Qt5Network.dll" + Source="release\Qt5Network.dll"/> + <File + Id="QtWidgets" + Name="Qt5Widgets.dll" + Source="release\Qt5Widgets.dll"/> + <File + Id="QtXml" + Name="Qt5Xml.dll" + Source="release\Qt5Xml.dll"/> + <File + Id="QtSvg" + Name="Qt5Svg.dll" + Source="release\Qt5Svg.dll"/> + </Component> + + <Directory Id="Platforms" Name="platforms"> + <Component + Id="Qt5PlatformPlugins" + Guid="1FFB773E-6D6D-4C0E-832B-F0FFEA959CA5"> + <File + Id="qminimal" + Name="qminimal.dll" + Source="release\qminimal.dll"/> + <File + Id="qwindows" + Name="qwindows.dll" + Source="release\qwindows.dll"/> </Component> - + </Directory> + + <Directory Id="Helpers" Name="helpers"> <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" + Id="Piper64" + Guid="6385BD86-A5D3-4C77-AD41-B2DCA5B34E48"> + <File + Id="piperconv64" + Name="piper-convert.exe" + Source="release\piper-convert.exe"/> + <File + Id="piper64" + Name="piper-vamp-simple-server.exe" + Source="release\piper-vamp-simple-server.exe"/> + </Component> + <Component + Id="Piper32" + Guid="F27A00A8-DD03-45B0-A13C-8CD8CC6F7386"> + <File + Id="piper32" + Name="piper-vamp-simple-server-32.exe" + Source="release\piper-vamp-simple-server-32.exe"/> + <File + Id="libgcc32" Name="libgcc_s_dw2-1.dll" - DiskId="1" Source="release\libgcc_s_dw2-1.dll"/> - <File - Id="libstdcplusplus" + <File + Id="libstdcplusplus32" Name="libstdc++-6.dll" - DiskId="1" Source="release\libstdc++-6.dll"/> - <File - Id="libwinpthread" + <File + Id="libwinpthread32" Name="libwinpthread-1.dll" - DiskId="1" Source="release\libwinpthread-1.dll"/> - </Component> + </Component> + <Component + Id="Checker64" + Guid="19A400D9-D5B2-4CB5-AF84-7C1DEA11D7B5"> + <File + Id="checker64" + Name="plugin-checker-helper.exe" + Source="release\plugin-checker-helper.exe"/> + </Component> + <Component + Id="Checker32" + Guid="19A400D9-D5B2-4CB5-AF84-7C1DEA11D7B5"> + <File + Id="checker32" + Name="plugin-checker-helper-32.exe" + Source="release\plugin-checker-helper-32.exe"/> + </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> <!-- helpers --> + </Directory> <!-- sv --> + </Directory> <!-- pfiles64 --> <Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuDir" Name="Sonic Visualiser"> @@ -209,18 +235,22 @@ </Directory> <Feature - Id="Complete" - Title="Required files" - Description="Installs the required files for running Sonic Visualiser." - AllowAdvertise="no" - Absent="disallow" - ConfigurableDirectory="APPLICATIONFOLDER" - Level="1"> + 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="Piper64"/> + <ComponentRef Id="Piper32"/> + <ComponentRef Id="Checker64"/> + <ComponentRef Id="Checker32"/> <ComponentRef Id="ProgramMenuDir"/> </Feature> @@ -237,7 +267,7 @@ <Icon Id="winicon.ico" SourceFile="icons/sv-winicon.ico"/> <Property Id="ARPPRODUCTICON" Value="winicon.ico" /> - + </Product> </Wix>