Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable wix: make x86 shell extension optional on x64 platforms

Changeset 350ce81260d3…

Parent 541016ba86ae…

by Adrian Buehlmann

Changes to one file · Browse files at 350ce81260d3 Showing diff from parent 541016ba86ae Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
239
240
241
 
224
225
226
 
 
 
 
 
 
 
 
 
 
 
 
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
@@ -224,18 +224,29 @@
  <MergeRef Id='VCRedist'/>   <MergeRef Id='VCRedistPolicy' />   </Feature> - <Feature Id='ShellExtension' Title='Shell Extension' Description='Windows Explorer Integration' Level='1'> - <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <?if $(var.Platform) = "x86" ?> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <?endif?> - <ComponentRef Id='thgshellx86dll' /> - <?if $(var.Platform) = "x64" ?> - <MergeRef Id='TortoiseOverlaysMergeX64' /> - <ComponentRef Id='thgshellx64dll' /> - <?endif?> - </Feature> + <?if $(var.Platform) = "x86" ?> + <Feature Id='ShellExtension' Title='Shell Extension' Level='1' AllowAdvertise='no' + Description='Overlay icons and context menu'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX86' /> + <ComponentRef Id='thgshellx86dll' /> + </Feature> + <?elseif $(var.Platform) = "x64" ?> + <Feature Id='ShellExtension' Title='Shell Extension x64' Level='1' AllowAdvertise='no' + Description='Overlay icons and context menu for 64 bit processes'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX64' /> + <ComponentRef Id='thgshellx64dll' /> + <Feature Id='ShellExtensionx86' Title='Shell Extension x86' Display='expand' Level='1' + AllowAdvertise='no' + Description='Overlay icons and context menu for 32 bit processes'> + <!-- <MergeRef Id='TortoiseOverlaysMergeX86' /> --> + <ComponentRef Id='thgshellx86dll' /> + </Feature> + </Feature> + <?endif?>   <Feature Id='Locales' Title='Translations' Description='Mercurial and TortoiseHg Translations' Level='1'>   <ComponentGroupRef Id='localeFolder' />   <ComponentGroupRef Id='i18nFolder' />