Mercurial > hg > tony

changeset 305:7777fa612a16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32 build updates for Qt5.3 build
author Chris Cannam
date Thu, 12 Jun 2014 17:23:05 +0100
parents d4530fab80bd
children 6c5df12a08da
files .hgsubstate deploy/win32/build.cmd deploy/win32/tony.wxs
diffstat 3 files changed, 26 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu Jun 12 09:54:05 2014 +0100
+++ b/.hgsubstate	Thu Jun 12 17:23:05 2014 +0100
@@ -1,7 +1,7 @@
 f82a28c2209fafa3a7f6568b08e99192508d178d chp
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
-d1f89559321a4a194bf98c43bb1df88c82ce1078 pyin
-27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
+63773a20ae22311e659fc7ddc2e340afecf21cae pyin
+553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 42a5801da931d1c4c3b42aa1d62cd8de7636f5cf svapp
 e88a15c25a4a5323be1b339c03218c9a1001d0f3 svcore
 488add397d34e6944f87a625689bbba5bffb5cf3 svgui
--- a/deploy/win32/build.cmd	Thu Jun 12 09:54:05 2014 +0100
+++ b/deploy/win32/build.cmd	Thu Jun 12 17:23:05 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 09:54:05 2014 +0100
+++ b/deploy/win32/tony.wxs	Thu Jun 12 17:23:05 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"