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

wix: add thgw.exe to installer

Remove desktop shortcut to thg.exe, which is now a console
application again. Add start menu shortcut to thgw.exe, which
can be dragged to the desktop if the user desires.

Changeset 4571fbf71c05…

Parent b116bd3fb016…

by Steve Borho

Changes to 2 files · Browse files at 4571fbf71c05 Showing diff from parent b116bd3fb016 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
49
50
51
 
52
53
54
 
49
50
51
52
53
54
55
@@ -49,6 +49,7 @@
  <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>     <?define ComponentMainExecutableGUID = {D648EC48-559C-4C66-A4CE-2D40A495DC5B} ?> + <?define ComponentWinExecutableGUID = {B4115B52-4FD3-478C-B605-D3F618287335} ?>     <?define thgshellx86dll.guid = {728E8840-5878-4EA7-918F-281C2697ABB1} ?>   <?define thgshellx64dll.guid = {D5D1E532-CDAD-4FFD-9695-757B8A29B4BA} ?>
Change 1 of 3 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
94
95
96
97
98
99
100
101
 
 
 
 
 
 
 
102
103
104
 
258
259
260
261
262
263
264
265
 
317
318
319
 
320
321
322
 
94
95
96
 
 
 
 
 
97
98
99
100
101
102
103
104
105
106
 
260
261
262
 
 
263
264
265
 
317
318
319
320
321
322
323
@@ -94,11 +94,13 @@
  <Environment Id="Environment" Name="PATH" Part="last" System="yes"   Permanent="no" Value="[INSTALLDIR]bin" Action="set"   /> - <Shortcut Id="desktopTHG" Directory="DesktopFolder" - Name="TortoiseHg Workbench" - WorkingDirectory='INSTALLDIR' - Icon="thgIcon.ico" IconIndex="0" - Advertise="yes" /> + </Component> + <Component Id='WinExecutable' Guid='$(var.ComponentWinExecutableGUID)'> + <File Id='thgwEXE' Name='thgw.exe' Source='dist\thgw.exe' /> + <Shortcut Id="thgStartMenu" Directory="ProgramMenuDir" + Name="TortoiseHg Workbench" + Icon="thgIcon.ico" IconIndex="0" Advertise="yes" + />   </Component>   <Component Id='ExtensionVersions' Guid='$(var.ExtensionVersions.guid)'>   <File Id='ExtensionVersions' Name='extension-versions.txt' @@ -258,8 +260,6 @@
  </Directory>   </Directory>   - <Directory Id="DesktopFolder" Name="Desktop"/> -   <Merge Id='VCRedist' DiskId='1' Language='1033'   SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm'   /> @@ -317,6 +317,7 @@
  Level='1' Absent='disallow' Display='hidden'   Description='Command line applications: hg, thg' >   <ComponentRef Id='MainExecutable' /> + <ComponentRef Id='WinExecutable' />   <ComponentRef Id='ProgramMenuDir' />   <ComponentRef Id='COPYING' />   <ComponentRef Id='mercurial.rc' />