# HG changeset patch
# User Chris Cannam
# Date 1550268064 0
# Node ID 36940effcfcf9ad7ec232bed5cbebcfd65a9f9eb
# Parent  702a70e48ca9246e60cb08b6be6d73af3a840fef
Windows build fixes

diff -r 702a70e48ca9 -r 36940effcfcf deploy/win32/tony.wxs
--- a/deploy/win32/tony.wxs	Fri Feb 15 18:14:04 2019 +0000
+++ b/deploy/win32/tony.wxs	Fri Feb 15 22:01:04 2019 +0000
@@ -64,28 +64,28 @@
                 Id="CHANGELOG"
                 Name="CHANGELOG.txt"
                 DiskId="1"
-                Source="CHANGELOG"/>
+                Source="..\CHANGELOG"/>
             <File
                 Id="COPYING"
                 Name="COPYING.txt"
                 DiskId="1"
-                Source="COPYING"/>
+                Source="..\COPYING"/>
             <File
                 Id="README"
                 Name="README.txt"
                 DiskId="1"
-                Source="README"/>
+                Source="..\README.md"/>
             <File
                 Id="CITATION"
                 Name="CITATION.txt"
                 DiskId="1"
-                Source="CITATION"/>
+                Source="..\CITATION"/>
 
             <File
                 Id="winicon.ico"
                 Name="tony-winicon.ico"
                 DiskId="1"
-                Source="icons/tony-winicon.ico"/>
+                Source="..\icons\tony-winicon.ico"/>
           </Component>
             
           <Component
@@ -95,17 +95,17 @@
                 Id="pyinlib"
                 Name="pyin.dll"
                 DiskId="1"
-                Source="pyin\win32-build\release\pyin.dll"/>
+                Source="release\pyin.dll"/>
             <File
                 Id="pyincat"
                 Name="pyin.cat"
                 DiskId="1"
-                Source="pyin\pyin.cat"/>
+                Source="..\pyin\pyin.cat"/>
             <File
                 Id="pyinrdf"
                 Name="pyin.n3"
                 DiskId="1"
-                Source="pyin\pyin.n3"/>
+                Source="..\pyin\pyin.n3"/>
           </Component>
           <Component
               Id="CHP"
@@ -114,7 +114,7 @@
                 Id="chplib"
                 Name="chp.dll"
                 DiskId="1"
-                Source="chp\win32-build\release\chp.dll"/>
+                Source="release\chp.dll"/>
           </Component>
 
           <Component
@@ -152,21 +152,6 @@
                 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"
@@ -240,9 +225,9 @@
     <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
     <Property Id="ApplicationFolderName" Value="Tony" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
-    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="..\deploy\win32\License.rtf" />
     
-    <Icon Id="winicon.ico" SourceFile="icons/tony-winicon.ico"/>
+    <Icon Id="winicon.ico" SourceFile="..\icons\tony-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
         
   </Product>
diff -r 702a70e48ca9 -r 36940effcfcf deploy/win64/build-and-package.bat
--- a/deploy/win64/build-and-package.bat	Fri Feb 15 18:14:04 2019 +0000
+++ b/deploy/win64/build-and-package.bat	Fri Feb 15 22:01:04 2019 +0000
@@ -37,7 +37,7 @@
 @echo Rebuilding 32-bit
 
 cd %STARTPWD%
-del /q /s build_win32
+rem del /q /s build_win32
 call .\deploy\win32\build-32.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
@@ -49,7 +49,7 @@
 @echo Rebuilding 64-bit
 
 cd %STARTPWD%
-del /q /s build_win64
+rem del /q /s build_win64
 call .\deploy\win64\build-64.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
diff -r 702a70e48ca9 -r 36940effcfcf deploy/win64/tony.wxs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/tony.wxs	Fri Feb 15 22:01:04 2019 +0000
@@ -0,0 +1,273 @@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <Product
+      Name="Tony" 
+      Id="*"
+      Language="1033"
+      Codepage="1252" 
+      Version="2.0"
+      UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
+      Manufacturer="Queen Mary, University of London">
+    
+    <Package
+        Id="*"
+        Keywords="Installer"
+        Description="Tony Installer" 
+        Comments="Copyright (c) 2015 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 Tony is already installed. Setup will now exit."/>
+
+    <Media Id="1" Cabinet="Tony.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+    <Property Id="DiskPrompt" Value="Tony Installation [1]"/>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+
+        <Directory Id="APPLICATIONFOLDER" Name="Tony">
+
+          <Component Win64="yes"
+              Id="MainExecutable"
+              Guid="B0DA872A-E8B9-4C41-B0B0-7702A9EBBD51">
+
+            <File
+                Id="T"
+                Name="Tony.exe"
+                DiskId="1"
+                Source="release\Tony.exe"
+                KeyPath="yes">
+
+              <Shortcut
+                  Id="TStartEntry"
+                  Directory="ProgramMenuDir"
+                  Name="Tony"
+		  Icon="winicon.ico"
+		  IconIndex="0"
+                  WorkingDirectory="INSTALLDIR"
+                  Advertise="yes"/>
+	      
+              <Shortcut
+                  Id="TDesktop"
+                  Directory="DesktopFolder"
+                  Name="Tony"
+		  Icon="winicon.ico"
+		  IconIndex="0"
+                  WorkingDirectory="INSTALLDIR"
+                  Advertise="yes"/>
+            </File>
+
+            <File
+                Id="CHANGELOG"
+                Name="CHANGELOG.txt"
+                DiskId="1"
+                Source="..\CHANGELOG"/>
+            <File
+                Id="COPYING"
+                Name="COPYING.txt"
+                DiskId="1"
+                Source="..\COPYING"/>
+            <File
+                Id="README"
+                Name="README.txt"
+                DiskId="1"
+                Source="..\README.md"/>
+            <File
+                Id="CITATION"
+                Name="CITATION.txt"
+                DiskId="1"
+                Source="..\CITATION"/>
+
+            <File
+                Id="winicon.ico"
+                Name="tony-winicon.ico"
+                DiskId="1"
+                Source="..\icons\tony-winicon.ico"/>
+          </Component>
+            
+          <Component Win64="yes"
+              Id="pYin"
+              Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5">
+            <File
+                Id="pyinlib"
+                Name="pyin.dll"
+                DiskId="1"
+                Source="release\pyin.dll"/>
+            <File
+                Id="pyincat"
+                Name="pyin.cat"
+                DiskId="1"
+                Source="..\pyin\pyin.cat"/>
+            <File
+                Id="pyinrdf"
+                Name="pyin.n3"
+                DiskId="1"
+                Source="..\pyin\pyin.n3"/>
+          </Component>
+          <Component Win64="yes"
+              Id="CHP"
+              Guid="3567639C-BFA5-46EC-BA2D-C4899508B0D0">
+            <File
+                Id="chplib"
+                Name="chp.dll"
+                DiskId="1"
+                Source="release\chp.dll"/>
+          </Component>
+
+          <Component Win64="yes"
+              Id="Qt5"
+              Guid="7DCE15D9-DB56-4ECC-A324-A9B74E30B872">
+            <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="QtSvg"
+                Name="Qt5Svg.dll"
+                DiskId="1"
+                Source="release\Qt5Svg.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"/>
+          </Component>
+
+          <Component Win64="yes"
+                     Id="Sndfile"
+                     Guid="04533516-6460-4155-A0D4-E9BA4D31E95C">
+            <File
+                Id="libsndfile"
+                Name="libsndfile-1.dll"
+                Source="..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll"
+                KeyPath="yes"/>
+          </Component>
+
+          <Component Win64="yes"
+               Id="VCRuntime"
+               Guid="251D9513-BBD2-47CF-BE78-EF79446F7683">
+
+            <!-- Redistributables are handled by the Visual Studio
+                 installer (a separate program from VS itself) and are
+                 installed into C:\Program Files (x86)\Microsoft
+                 Visual Studio\2017\Community\VC\Redist\MSVC\...  NB
+                 this is not the same thing as the Windows SDKs, which
+                 consist of build tools etc - they have their own
+                 installers and get installed by default to C:\Program
+                 Files (x86)\Windows Kits\... -->
+               
+               <File
+                   Id="concrt140"
+                   Name="concrt140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\concrt140.DLL"
+                   KeyPath="yes"/>
+               <File
+                   Id="msvcp140"
+                   Name="msvcp140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
+               <File
+                   Id="vccorlib140"
+                   Name="vccorlib140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
+               <File
+                   Id="vcruntime140"
+                   Name="vcruntime140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
+          </Component>
+
+	  <Directory Id="Platforms" Name="platforms">
+            <Component Win64="yes"
+                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="Styles" Name="styles">
+            <Component Win64="yes"
+                Id="Qt5StylePlugins"
+                Guid="7A676FC1-B139-432C-A7D3-F33984934B79">
+	      <File
+                  Id="qwindowsvistastyle"
+                  Name="qwindowsvistastyle.dll"
+                  Source="release\qwindowsvistastyle.dll"/>
+            </Component>
+	  </Directory>
+        </Directory>
+	
+      </Directory>
+      
+      <Directory Id="ProgramMenuFolder" Name="Programs">
+        <Directory Id="ProgramMenuDir" Name="Tony">
+          <Component Id="ProgramMenuDir" Guid="56B6BB05-453C-4480-81DA-31612ED64410">
+            <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 Tony."
+      AllowAdvertise="no"
+      Absent="disallow"
+      ConfigurableDirectory="APPLICATIONFOLDER"
+      Level="1">
+      <ComponentRef Id="pYin"/>
+      <ComponentRef Id="CHP"/>
+      <ComponentRef Id="MainExecutable"/>
+      <ComponentRef Id="Sndfile"/>
+      <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="VCRuntime"/>
+      <ComponentRef Id="Qt5PlatformPlugins"/>
+      <ComponentRef Id="Qt5StylePlugins"/>
+      <ComponentRef Id="ProgramMenuDir"/>
+    </Feature>
+
+    <UI>
+      <UIRef Id="WixUI_InstallDir" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+    </UI>
+		
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+    <Property Id="ApplicationFolderName" Value="Tony" />
+    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    <WixVariable Id="WixUILicenseRtf" Value="..\deploy\win64\License.rtf" />
+    
+    <Icon Id="winicon.ico" SourceFile="..\icons\tony-winicon.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
+        
+  </Product>
+</Wix>