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

wix: revert to upgrading hgtk based packages

2.x and 1.x installers will not be able to live together without a major
infrastructure investment, so it's probably not going to happen.

Changeset a207b83ed66f…

Parent 37be01a188c5…

by Steve Borho

Changes to 2 files · Browse files at a207b83ed66f Showing diff from parent 37be01a188c5 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
46
47
48
49
 
50
51
52
 
46
47
48
 
49
50
51
52
@@ -46,7 +46,7 @@
  <?define thgI18nFolder.guid = {55DC742A-1E22-4A6C-B090-FD1E91AB8646} ?>     <!-- tortoisehg.wxs --> - <?define ProductUpgradeCode = {F6FC11E9-0629-4D51-9286-E7ED9C8A54BD} ?> + <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>     <?define ComponentMainExecutableGUID = {D648EC48-559C-4C66-A4CE-2D40A495DC5B} ?>  
Change 1 of 2 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
14
15
16
17
 
18
19
20
 
86
87
88
89
 
90
91
92
 
14
15
16
 
17
18
19
20
 
86
87
88
 
89
90
91
92
@@ -14,7 +14,7 @@
  <?define IsX64 = no ?>   <?endif?>   - <?define ProgramRegKey = Software\TortoiseHg2 ?> + <?define ProgramRegKey = Software\TortoiseHg ?>     <?include TortoiseOverlaysDefines.wxi ?>   @@ -86,7 +86,7 @@
    <Directory Id='TARGETDIR' Name='SourceDir'>   <Directory Id='ProgramFilesFolder' Name='PFiles'> - <Directory Id='INSTALLDIR' Name='TortoiseHg2'> + <Directory Id='INSTALLDIR' Name='TortoiseHg'>   <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'>   <File Id='thgEXE' Name='thg.exe' KeyPath='yes'   Source='dist\thg.exe'