Mercurial > hg > tony

changeset 235:ac08764bc5c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Wed, 12 Mar 2014 09:58:25 +0000
parents 9d10a61f454f (diff) 108f67eca61c (current diff)
children 389ed196d23b
files
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Mar 12 09:13:16 2014 +0000
+++ b/.hgsubstate	Wed Mar 12 09:58:25 2014 +0000
@@ -1,4 +1,4 @@
-e9b6295784884a0883ea5ddc073c926ee134af64 chp
+0ca7c7e21991b7cf5c6c4306af64280947d0b357 chp
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 60eb8771d34050e3bed8e715f5fcd0275de469ef pyin
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
--- a/.hgtags	Wed Mar 12 09:13:16 2014 +0000
+++ b/.hgtags	Wed Mar 12 09:58:25 2014 +0000
@@ -6,3 +6,4 @@
 ae0bf8dc5833d9b187b0aa8f642450f8ed9ca1f6 v0.4
 ae0bf8dc5833d9b187b0aa8f642450f8ed9ca1f6 v0.4
 fc04fd860d7fceaee2c3fe1bfbd1d2b63a44c12b v0.4
+e0337a99285d0efe486025184bd1a3f0752dc1dd v0.4_win32_build
--- a/deploy/win32/tony.wxs	Wed Mar 12 09:13:16 2014 +0000
+++ b/deploy/win32/tony.wxs	Wed Mar 12 09:58:25 2014 +0000
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="0.1" 
+      Version="0.4"
       UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
       Manufacturer="Queen Mary, University of London">
     
@@ -48,6 +48,15 @@
                 DiskId="1"
                 Source="pyin\pyin.n3"/>
           </Component>
+          <Component
+              Id="CHP"
+              Guid="3567639C-BFA5-46EC-BA2D-C4899508B0D0">
+            <File
+                Id="chplib"
+                Name="chp.dll"
+                DiskId="1"
+                Source="chp\win32-build\release\chp.dll"/>
+          </Component>
         </Directory>
 
         <Directory Id="APPLICATIONFOLDER" Name="Tony">
@@ -214,6 +223,7 @@
       ConfigurableDirectory="APPLICATIONFOLDER"
       Level="1">
       <ComponentRef Id="pYin"/>
+      <ComponentRef Id="CHP"/>
       <ComponentRef Id="MainExecutable"/>
       <ComponentRef Id="Qt5"/>
       <ComponentRef Id="Qt5PlatformPlugins"/>