Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.1, 1.9.2, and 1.9.3

wix: include x64 version of kdiff3 in x64 installers

Changeset 313896d37207…

Parent ce5851bcf8a6…

by Steve Borho

Changes to one file · Browse files at 313896d37207 Showing diff from parent ce5851bcf8a6 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
189
190
191
192
193
194
195
196
 
 
 
 
 
 
 
 
 
 
 
 
197
198
199
 
189
190
191
 
 
 
 
 
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
@@ -189,11 +189,18 @@
  Source='dist\docdiff.exe'   />   </Component> - <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'> - <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes' - Source='..\contrib\kdiff3.exe' - /> - </Component> + + <?if $(var.Platform) = "x64" ?> + <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'> + <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes' + Source='..\contrib\kdiff3x64.exe'/> + </Component> + <?else?> + <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'> + <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes' + Source='..\contrib\kdiff3.exe'/> + </Component> + <?endif?>     <Directory Id='docFolder' Name='doc'>   <Component Id='chmFile' Guid='$(var.chmFile.guid)' Win64='$(var.IsX64)'>