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

stable wix: add separate features for overlays

Changeset 40bbc09df86b…

Parent 70c37eaa91a4…

by Adrian Buehlmann

Changes to one file · Browse files at 40bbc09df86b Showing diff from parent 70c37eaa91a4 Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
334
335
336
337
338
 
 
339
340
 
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
 
 
 
 
 
 
 
365
366
367
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
368
369
370
 
450
451
452
453
454
455
 
 
 
 
 
 
 
 
 
456
457
458
 
334
335
336
 
 
337
338
339
 
340
341
 
 
 
 
 
 
 
 
 
 
 
 
 
342
343
 
 
 
 
 
 
 
 
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
 
451
452
453
 
 
 
454
455
456
457
458
459
460
461
462
463
464
465
@@ -334,37 +334,38 @@
  <MergeRef Id='VCRedist'/>   <MergeRef Id='VCRedistPolicy' />   </Feature> - <?if $(var.Platform) = "x86" ?> - <Feature Id='ShellExtension' Title='Shell Extension' + <?if $(var.Platform) = "x64" ?> + <Feature Id='ShellExtensionX64' Title='Shell Extension x64'   Level='1' AllowAdvertise='no' - Description='Overlay icons and context menu'> + Description='Context menu for 64-bit processes'>   <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <ComponentRef Id='thgshellx86dll' /> - <ComponentRef Id='CmenuShellRegistrationX86' /> - <ComponentRef Id='OverlaysShellRegistrationX86' /> - </Feature> - <?elseif $(var.Platform) = "x64" ?> - <Feature Id='ShellExtension' Level='1' Display='expand' AllowAdvertise='no' - Title='Shell Extension x64' - Description='Overlay icons and context menu for 64 bit processes'> - <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <MergeRef Id='TortoiseOverlaysMergeX64' />   <ComponentRef Id='thgshellx64dll' />   <ComponentRef Id='CmenuShellRegistrationX64' /> - <ComponentRef Id='OverlaysShellRegistrationX64' /> - <Feature Id='ShellExtensionx86' Level='1' AllowAdvertise='no' - Title='Shell Extension x86' - Description='Overlay icons and context menu for 32 bit processes'> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <ComponentRef Id='thgshellx86dll' /> - <ComponentRef Id='CmenuShellRegistrationX86' /> - <ComponentRef Id='OverlaysShellRegistrationX86' /> + <Feature Id='OverlaysX64' Title='Overlay Icons' + Level='1' AllowAdvertise='no' + Description='Overlay icons for 64-bit processes' + > + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX64' /> + <ComponentRef Id='OverlaysShellRegistrationX64' />   </Feature>   </Feature>   <?endif?> + <Feature Id='ShellExtensionX86' Title='Shell Extension x86' + Level='1' AllowAdvertise='no' + Description='Context menu for 32-bit processes'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgshellx86dll' /> + <ComponentRef Id='CmenuShellRegistrationX86' /> + <Feature Id='OverlaysX86' Title='Overlay Icons' + Level='1' AllowAdvertise='no' + Description='Overlay icons for 32-bit processes' + > + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX86' /> + <ComponentRef Id='OverlaysShellRegistrationX86' /> + </Feature> + </Feature>   <Feature Id='Locales' Level='1'   Title='Translations'   Description='Mercurial and TortoiseHg Translations'> @@ -450,9 +451,15 @@
  <RemoveExistingProducts After="InstallValidate">   INSTALLEDTORTOISEHGPRODUCTS   </RemoveExistingProducts> - <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> - <![CDATA[&ShellExtension=3]]> - </Custom> + <?if $(var.Platform) = "x64" ?> + <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <![CDATA[&OverlaysX86=3 OR &OverlaysX64=3]]> + </Custom> + <?else?> + <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <![CDATA[&OverlaysX86=3]]> + </Custom> + <?endif?>   </InstallExecuteSequence>     <Upgrade Id='$(var.ProductUpgradeCode)'>