Mercurial > hg > tony

changeset 306:6c5df12a08da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 12 Jun 2014 17:23:23 +0100
parents 7777fa612a16 (diff) 42b355b50e52 (current diff)
children af77bfeaa159
files .hgsubstate
diffstat 3 files changed, 26 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu Jun 12 15:03:21 2014 +0100
+++ b/.hgsubstate	Thu Jun 12 17:23:23 2014 +0100
@@ -1,7 +1,7 @@
 f82a28c2209fafa3a7f6568b08e99192508d178d chp
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
-d1f89559321a4a194bf98c43bb1df88c82ce1078 pyin
-27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
+63773a20ae22311e659fc7ddc2e340afecf21cae pyin
+553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 337cdb5e5b06901d7971e9499a90fd167441fc46 svapp
 e88a15c25a4a5323be1b339c03218c9a1001d0f3 svcore
 bb1f2a20f7dbc860f7e9778c87315be3c2817b52 svgui
--- a/deploy/win32/build.cmd	Thu Jun 12 15:03:21 2014 +0100
+++ b/deploy/win32/build.cmd	Thu Jun 12 17:23:23 2014 +0100
@@ -1,11 +1,16 @@
 @ECHO OFF
-SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.7\bin"
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.8\bin"
 IF NOT EXIST %WIXPATH% (
-    SET WIXPATH="C:\Program Files\WiX Toolset v3.7\bin"
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.8\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
+IF NOT EXIST %WIXPATH% (
+    ECHO "WiX not found, exiting"
+)
+IF EXIST %WIXPATH% (
+    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/tony.wxs	Thu Jun 12 15:03:21 2014 +0100
+++ b/deploy/win32/tony.wxs	Thu Jun 12 17:23:23 2014 +0100
@@ -135,40 +135,25 @@
                   DiskId="1"
                   Source="release\Qt5Xml.dll"/>
               <File
-                  Id="D3DCompiler"
-                  Name="D3DCompiler_43.dll"
+                  Id="icudt52"
+                  Name="icudt52.dll"
                   DiskId="1"
-                  Source="release\D3DCompiler_43.dll"/>
+                  Source="release\icudt52.dll"/>
               <File
-                  Id="icudt49"
-                  Name="icudt49.dll"
+                  Id="icuin52"
+                  Name="icuin52.dll"
                   DiskId="1"
-                  Source="release\icudt49.dll"/>
+                  Source="release\icuin52.dll"/>
               <File
-                  Id="icuin49"
-                  Name="icuin49.dll"
+                  Id="icuuc52"
+                  Name="icuuc52.dll"
                   DiskId="1"
-                  Source="release\icuin49.dll"/>
-              <File
-                  Id="icuuc49"
-                  Name="icuuc49.dll"
-                  DiskId="1"
-                  Source="release\icuuc49.dll"/>
-              <File
-                  Id="libEGL"
-                  Name="libEGL.dll"
-                  DiskId="1"
-                  Source="release\libEGL.dll"/>
+                  Source="release\icuuc52.dll"/>
               <File
                   Id="libgcc"
-                  Name="libgcc_s_sjlj-1.dll"
+                  Name="libgcc_s_dw2-1.dll"
                   DiskId="1"
-                  Source="release\libgcc_s_sjlj-1.dll"/>
-              <File
-                  Id="libGLESv2"
-                  Name="libGLESv2.dll"
-                  DiskId="1"
-                  Source="release\libGLESv2.dll"/>
+                  Source="release\libgcc_s_dw2-1.dll"/>
               <File
                   Id="libstdcplusplus"
                   Name="libstdc++-6.dll"