# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1524835646 -3600
# Node ID 9b858df4e8b0a86f8f2ef0d42f347c13ba3cee0f
# Parent  47105e880e90bb6af879cd87fddd24452c51e261
Windows installer build files

diff -r 47105e880e90 -r 9b858df4e8b0 .hgignore
--- a/.hgignore	Fri Apr 27 10:55:12 2018 +0100
+++ b/.hgignore	Fri Apr 27 14:27:26 2018 +0100
@@ -4,9 +4,12 @@
 *.obj
 *.so
 *.dll
+*.msi
 glob:.vext-*.bin
 build/msvc/Debug
 build/msvc/Release
 build/msvc/x64/Debug
 build/msvc/x64/Release
 re:^build/mingw32/x64/Release/
+.vs
+*.db
diff -r 47105e880e90 -r 9b858df4e8b0 build/general/README.txt
--- a/build/general/README.txt	Fri Apr 27 10:55:12 2018 +0100
+++ b/build/general/README.txt	Fri Apr 27 14:27:26 2018 +0100
@@ -91,13 +91,8 @@
 To Install
 ==========
 
-Installation depends on your operating system.
-
-    Win 32  -> Copy qm-vamp-plugins.dll, qm-vamp-plugins.cat and
-               qm-vamp-plugins.n3 to C:\Program Files\Vamp Plugins\
-
-    Win 64  -> Copy qm-vamp-plugins.dll, qm-vamp-plugins.cat and
-               qm-vamp-plugins.n3 to C:\Program Files\Vamp Plugins (x86)\
+Installation depends on your operating system and (on Windows) whether
+you are installing a 32- or 64-bit version of the plugin set.
 
     OS/X    -> Copy qm-vamp-plugins.dylib, qm-vamp-plugins.cat and
                qm-vamp-plugins.n3 to $HOME/Library/Audio/Plug-Ins/Vamp/
@@ -107,3 +102,12 @@
                qm-vamp-plugins.n3 to $HOME/vamp/ or /usr/local/lib/vamp/
                or /usr/lib/vamp/
 
+    32-bit Windows with 32-bit plugin set, or
+    64-bit Windows with 64-bit plugin set
+            -> Copy qm-vamp-plugins.dll, qm-vamp-plugins.cat and
+               qm-vamp-plugins.n3 to C:\Program Files\Vamp Plugins\
+
+    64-bit Windows with 32-bit plugin set
+            -> Copy qm-vamp-plugins.dll, qm-vamp-plugins.cat and
+               qm-vamp-plugins.n3 to C:\Program Files\Vamp Plugins (x86)\
+
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/License.rtf
Binary file build/msvc/License.rtf has changed
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/build.cmd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/msvc/build.cmd	Fri Apr 27 14:27:26 2018 +0100
@@ -0,0 +1,11 @@
+@ECHO OFF
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.11\bin"
+IF NOT EXIST %WIXPATH% (
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.11\bin"
+)
+DEL qm-vamp-plugins.msi
+%WIXPATH%\candle.exe -v qm-vamp-plugins.wxs
+%WIXPATH%\light.exe -ext WixUIExtension -v qm-vamp-plugins.wixobj
+PAUSE
+DEL qm-vamp-plugins.wixobj
+DEL qm-vamp-plugins.wixpdb
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/main.bmp
Binary file build/msvc/main.bmp has changed
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/qm-vamp-plugins.wxs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/msvc/qm-vamp-plugins.wxs	Fri Apr 27 14:27:26 2018 +0100
@@ -0,0 +1,123 @@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <Product
+      Name="QM Vamp Plugins" 
+      Id="*"
+      Language="1033"
+      Codepage="1252" 
+      Version="1.7.1.1"
+      UpgradeCode="7d427a49-7a1e-45d4-a181-c75fe8f489b7"
+      Manufacturer="Queen Mary, University of London">
+    
+    <Package
+        Id="*"
+        Keywords="Installer"
+        Description="QM Vamp Plugins 64-bit Installer"
+        Comments="Copyright (c) 2018 Queen Mary, University of London"
+        Manufacturer="Queen Mary, University of London" 
+        InstallerVersion="200"
+        Languages="1033" 
+        Compressed="yes" 
+        Platform="x64"
+        SummaryCodepage="1252"/>
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of the QM Vamp Plugins set is already installed. Setup will now exit."/>
+
+    <Media Id="1" Cabinet="QMVampPlugins.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+    <Property Id="DiskPrompt" Value="QM Vamp Plugins Installation [1]"/>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+
+      <Directory Id="ProgramFiles64Folder" Name="PFiles64">
+        <Directory Id="VampPlugins" Name="Vamp Plugins">
+
+          <Component Win64="yes"
+              Id="Plugin64"
+              Guid="7df55391-7d82-4f4f-a4e1-e0bba6b339fc">
+            <File
+                Id="README64"
+                Name="qm-vamp-plugins-README.txt"
+                Source="..\general\README.txt"/>
+            <File
+                Id="COPYING64"
+                Name="qm-vamp-plugins-COPYING.txt"
+                Source="..\..\COPYING"/>
+            <File
+                Id="Cat64"
+                Name="qm-vamp-plugins.cat"
+                Source="..\..\qm-vamp-plugins.cat"/>
+            <File
+                Id="Turtle64"
+                Name="qm-vamp-plugins.n3"
+                Source="..\..\qm-vamp-plugins.n3"/>
+            <File
+                Id="PluginLibrary64"
+                Name="qm-vamp-plugins.dll"
+                Source="x64\Release\qm-vamp-plugins.dll"/>
+          </Component>
+
+	</Directory> <!-- vamp -->
+      </Directory> <!-- pfiles64 -->
+
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="Vamp32Plugins" Name="Vamp Plugins">
+        
+          <Component
+              Id="Plugin32"
+              Guid="9401a7ab-f3fa-499e-bb51-2231707daf7c">
+            <File
+                Id="README32"
+                Name="qm-vamp-plugins-README.txt"
+                Source="..\general\README.txt"/>
+            <File
+                Id="COPYING32"
+                Name="qm-vamp-plugins-COPYING.txt"
+                Source="..\..\COPYING"/>
+            <File
+                Id="Cat32"
+                Name="qm-vamp-plugins.cat"
+                Source="..\..\qm-vamp-plugins.cat"/>
+            <File
+                Id="Turtle32"
+                Name="qm-vamp-plugins.n3"
+                Source="..\..\qm-vamp-plugins.n3"/>
+            <File
+                Id="PluginLibrary32"
+                Name="qm-vamp-plugins.dll"
+                Source="Release\qm-vamp-plugins.dll"/>
+          </Component>
+          
+        </Directory>
+      </Directory>
+
+    </Directory>
+
+    <Feature 
+	Id="Complete"
+	Title="Required files"
+	Description="Installs the required files for the QM Vamp Plugins."
+	AllowAdvertise="no"
+	Absent="disallow"
+	Level="1">
+      <ComponentRef Id="Plugin64"/>
+      <ComponentRef Id="Plugin32"/>
+    </Feature>
+
+    <UI>
+      <UIRef Id="WixUI_Minimal" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+    </UI>
+
+    <Property Id="WIXUI_DONTVALIDATEPATH" Value="1" />
+    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+    
+    <Icon Id="winicon.ico" SourceFile="sv-winicon.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
+
+    <WixVariable Id="WixUIBannerBmp" Value="top.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="main.bmp"/>
+
+  </Product>
+</Wix>
+
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/sv-winicon.ico
Binary file build/msvc/sv-winicon.ico has changed
diff -r 47105e880e90 -r 9b858df4e8b0 build/msvc/top.bmp
Binary file build/msvc/top.bmp has changed