Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

win32: hookup registry.iss

Changeset b90de4a753fd…

Parent bcb460a0f09a…

by Steve Borho

Changes to 3 files · Browse files at b90de4a753fd Showing diff from parent bcb460a0f09a Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
46
47
48
 
49
50
51
 
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
 
200
201
202
 
210
211
212
 
 
 
46
47
48
49
50
51
52
 
181
182
183
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
184
185
186
187
 
195
196
197
198
199
@@ -46,6 +46,7 @@
 Source: ..\contrib\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays;  Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete +Source: win32\shellext\THgShell.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\library.zip; DestDir: {app}  Source: doc\*.html; DestDir: {app}\docs @@ -180,23 +181,7 @@
  {abort installation if TortoiseHg 0.4 or earlier is installed}   if RegQueryStringValue(HKLM, 'Software\TortoiseHg', '', ThgSwReg) then   begin - IsUpgrade := True; - {if old shell extensions are found, force uninstall and reboot} - if (FileExists(ThgSwReg + '\tortoisehg.dll')) then - begin - msg := 'TortoiseHg Setup Error:' + CRLF + CRLF + - 'The version of TortoiseHg installed is too old to upgrade in place.' + CRLF + - 'You must uninstall it before installing this version.' + CRLF + CRLF + - 'Please uninstall the existing version, then run the installer again ' + - 'to continue.'; - MsgBox(msg, mbError, MB_OK); - Result := False; {quit and abort installation} - end else begin - msg := 'Your current site-wide Mercurial.ini will be copied into' + CRLF + - ThgSwReg + '\backup' + CRLF + - 'After install you may merge changes back into the new Mercurial.ini' - MsgBox(msg, mbInformation, MB_OK); - end; + IsUpgrade := True;   end;  end;   @@ -210,3 +195,5 @@
  Result := False;   end;  end; + +#include "registry.iss"
Show Entire File contrib/​win32/​registry.iss Stacked
renamed from win32/shellext/registry.iss
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​ThgShell.iss Stacked
 
19
20
21
22
 
23
24
25
 
19
20
21
 
22
23
24
25
@@ -19,7 +19,7 @@
 VersionInfoCompany=TK Soh and others  InternalCompressLevel=max  SolidCompression=true -;SetupIconFile=icons\tortoise\hg.ico +;SetupIconFile=icons\hg.ico  AllowNoIcons=true  DefaultGroupName=TortoiseHg  PrivilegesRequired=poweruser