changeset 629:74e8894027c7

Minor tweaks to Windows packaging
author Chris Cannam
date Thu, 10 Oct 2019 14:35:40 +0100
parents c4a25a5e1745
children e77c6e2f6453
files deploy/win64/build-64.bat deploy/win64/tony.wxs
diffstat 2 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/win64/build-64.bat	Thu Oct 10 14:23:28 2019 +0100
+++ b/deploy/win64/build-64.bat	Thu Oct 10 14:35:40 2019 +0100
@@ -3,7 +3,7 @@
 
 set STARTPWD=%CD%
 
-set QTDIR=C:\Qt\5.13.0\msvc2017_64
+set QTDIR=C:\Qt\5.13.1\msvc2017_64
 if not exist %QTDIR% (
 @   echo Could not find 64-bit Qt
 @   exit /b 2
--- a/deploy/win64/tony.wxs	Thu Oct 10 14:23:28 2019 +0100
+++ b/deploy/win64/tony.wxs	Thu Oct 10 14:35:40 2019 +0100
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="2.0"
+      Version="2.1"
       UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
       Manufacturer="Queen Mary, University of London">
     
@@ -121,16 +121,6 @@
                 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"