Mercurial > hg > tony

changeset 87:c6603f0ddde5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update win32 build stuff
author Chris Cannam
date Tue, 03 Dec 2013 17:10:00 +0000
parents 91cc6e6a4db3
children c1f101fc83b0
files deploy/win32/License.rtf deploy/win32/build.cmd deploy/win32/tonioni.wxs
diffstat 3 files changed, 65 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
Binary file deploy/win32/License.rtf has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win32/build.cmd	Tue Dec 03 17:10:00 2013 +0000
@@ -0,0 +1,11 @@
+@ECHO OFF
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.7\bin"
+IF NOT EXIST %WIXPATH% (
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.7\bin"
+)
+DEL tony.msi
+%WIXPATH%\candle.exe -v tony.wxs
+%WIXPATH%\light.exe -b ..\.. -ext WixUIExtension -v tony.wixobj
+PAUSE
+DEL tony.wixobj
+DEL tony.wixpdb
--- a/deploy/win32/tonioni.wxs	Tue Dec 03 17:06:23 2013 +0000
+++ b/deploy/win32/tonioni.wxs	Tue Dec 03 17:10:00 2013 +0000
@@ -13,7 +13,7 @@
         Id="*"
         Keywords="Installer"
         Description="Tony Installer" 
-        Comments="Copyright (c) 2012 Queen Mary, University of London and others." 
+        Comments="Copyright (c) 2013 Queen Mary, University of London and others." 
         Manufacturer="Queen Mary, University of London" 
         InstallerVersion="100" 
         Languages="1033" 
@@ -28,7 +28,29 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="PFiles">
 
-        <Directory Id="INSTALLDIR" Name="Tony">
+        <Directory Id="VampPlugins" Name="Vamp Plugins">
+          <Component
+              Id="pYin"
+              Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5">
+            <File
+                Id="pyinlib"
+                Name="pyin.dll"
+                DiskId="1"
+                Source="..\pyin\win32-build\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>
+        </Directory>
+
+        <Directory Id="APPLICATIONFOLDER" Name="Tony">
             
             <Component
                 Id="MainExecutable"
@@ -55,7 +77,7 @@
                     WorkingDirectory="INSTALLDIR"
                     Advertise="yes"/>
               </File>
-<!--
+
               <File
                   Id="COPYING"
                   Name="COPYING"
@@ -71,7 +93,13 @@
                   Name="CHANGELOG"
                   DiskId="1"
                   Source="CHANGELOG"/>
-    -->        </Component>
+
+              <File
+                  Id="winicon.ico"
+                  Name="tony-winicon.ico"
+                  DiskId="1"
+                  Source="icons/tony-winicon.ico"/>
+            </Component>
 
             <Component
                 Id="Qt5"
@@ -167,28 +195,6 @@
 	    </Directory>
         </Directory>
 
-        <Directory Id="VampPlugins" Name="Vamp Plugins">
-            <Component
-                Id="Yintony"
-                Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5">
-                <File
-                    Id="yintonylib"
-                    Name="yintony.dll"
-                    DiskId="1"
-                    Source="..\yintony\win32-build\release\yintony.dll"/>
-                <File
-                    Id="yintonycat"
-                    Name="yintony.cat"
-                    DiskId="1"
-                    Source="..\yintony\yintony.cat"/>
-                <File
-                    Id="yintonyrdf"
-                    Name="yintony.n3"
-                    DiskId="1"
-                    Source="..\yintony\yintony.n3"/>
-            </Component>
-        </Directory>
-
       </Directory>
       
       <Directory Id="ProgramMenuFolder" Name="Programs">
@@ -204,13 +210,33 @@
 
     </Directory>
 
-    <Feature Id="Complete" Level="1">
+    <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="MainExecutable"/>
-      <ComponentRef Id="Yintony"/>
       <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="ApplicationFolderName" Value="Tony" />
+    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
+    
+    <Icon Id="winicon.ico" SourceFile="icons/tony-winicon.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
+        
   </Product>
 </Wix>