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

iss: split off a new iss file for just hgtk and hg

Also rename mercurial.iss to tortoisehg.iss, but do not change any of it's
content. Eventually, the tortoisehg installer package will include an hgtk
package, but for now it will work just as it always has.

Changeset 815c80cd092a…

Parent 110e4040e409…

by Steve Borho

Changes to 2 files · Browse files at 815c80cd092a Showing diff from parent 110e4040e409 Diff from another changeset...

Change 1 of 9 Show Entire File contrib/​win32/​hgtk.iss Stacked
copied from contrib/win32/mercurial.iss
 
6
7
8
9
10
11
 
 
 
12
13
14
15
 
16
17
18
19
20
21
 
22
23
24
25
26
 
 
 
27
28
29
 
34
35
36
37
38
39
40
41
42
43
 
47
48
49
50
51
52
53
 
68
69
70
71
72
73
74
75
76
77
 
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
 
105
106
107
108
109
110
111
112
 
120
121
122
123
124
 
 
 
125
126
127
 
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
 
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
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
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
 
6
7
8
 
 
 
9
10
11
12
13
14
 
15
16
17
18
19
20
 
21
22
23
 
 
 
24
25
26
27
28
29
 
34
35
36
 
 
37
 
38
39
40
 
44
45
46
 
47
48
49
 
64
65
66
 
 
 
 
67
68
69
 
72
73
74
 
75
76
77
 
 
 
78
79
80
81
82
83
 
84
85
86
 
92
93
94
 
 
95
96
97
 
105
106
107
 
 
108
109
110
111
112
113
 
122
123
124
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
125
126
127
 
162
163
164
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -6,24 +6,24 @@
 #endif    [Setup] -AppCopyright=Copyright 2005-2009 Matt Mackall and others -AppName=TortoiseHg -AppVerName=TortoiseHg {#VERSION} +AppCopyright=Copyright 2005-2009 Steve Borho and others +AppName=hgtk +AppVerName=hgtk {#VERSION}  InfoAfterFile=contrib/win32/postinstall.txt  LicenseFile=COPYING.txt  ShowLanguageDialog=yes -AppPublisher=Steve Borho and others +AppPublisher=Steve Borho  AppPublisherURL=http://tortoisehg.org/  AppSupportURL=http://tortoisehg.org/  AppUpdatesURL=http://tortoisehg.org/  AppID=TortoiseHg  AppContact=Steve Borho <steve@borho.org> -OutputBaseFilename=TortoiseHg-{#VERSION} +OutputBaseFilename=Hgtk-{#VERSION}  DefaultDirName={pf}\TortoiseHg  SourceDir=..\.. -VersionInfoDescription=Mercurial distributed SCM -VersionInfoCopyright=Copyright 2005-2009 Matt Mackall and others -VersionInfoCompany=Matt Mackall and others +VersionInfoDescription=TortoiseHg Dialogs for Mercurial SCM +VersionInfoCopyright=Copyright 2005-2009 Steve Borho and others +VersionInfoCompany=Steve Borho and others  InternalCompressLevel=max  SolidCompression=true  SetupIconFile=icons\thg_logo.ico @@ -34,10 +34,7 @@
 WizardSmallImageFile=..\misc\install-wizard-small.bmp  AllowNoIcons=true  DefaultGroupName=TortoiseHg -PrivilegesRequired=poweruser -AlwaysRestart=no  SetupLogging=yes -ArchitecturesInstallIn64BitMode=x64    [Types]  Name: full; Description: Full installation @@ -47,7 +44,6 @@
 Name: main; Description: Main Files (includes 'hg' and 'hgtk' commands); Types: full custom; Flags: fixed  Name: help; Description: Help Files; Types: full  Name: hgbook; Description: The book 'Mercurial: The Definitive Guide' (PDF); Types: full -Name: shell; Description: Shell integration (overlay icons, context menu) [admin required]; Types: full; Flags: restart; Check: ShellInstallPossible    [Files]  Source: ..\build-hg\contrib\mercurial.el; DestDir: {app}\contrib @@ -68,10 +64,6 @@
 Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt  Source: ..\contrib\*.exe; DestDir: {app}  Source: ..\contrib\*.dll; DestDir: {app} -Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays -Source: contrib\refreshicons.cmd; DestDir: {app}/contrib -Source: dist\*.exe; Excludes: thgtaskbar.exe; DestDir: {app}; Flags: ignoreversion -Source: dist\thgtaskbar.exe; DestDir: {app}; Flags: ignoreversion; Components: shell  Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion  Source: dist\library.zip; DestDir: {app}  Source: doc\build\pdf\*.pdf; DestDir: {app}/docs; Flags: ignoreversion; Components: help @@ -80,20 +72,15 @@
 Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs  Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs  Source: i18n\*.*; DestDir: {app}\i18n; Flags: recursesubdirs createallsubdirs -Source: win32\*.reg; DestDir: {app}\cmenu_i18n  Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt  Source: icons\thg_logo.ico; DestDir: {app}  Source: ..\misc\hgbook.pdf; DestDir: {app}/docs; Flags: ignoreversion; Components: hgbook -Source: ..\misc\ThgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete; Components: shell -Source: ..\misc\ThgShellx86.dll; DestDir: {app}; DestName: ThgShellx86.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete; Components: shell -Source: ..\misc\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete; Components: shell    [INI]  Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/  Filename: {app}\TortoiseHg.url; Section: InternetShortcut; Key: URL; String: http://tortoisehg.org/    [Icons] -Name: {group}\Start Taskbar App; Filename: {app}\thgtaskbar.exe; Components: shell  Name: {group}\TortoiseHg Book (chm); Filename: {app}\docs\TortoiseHg.chm; Components: help  Name: {group}\TortoiseHg Book (pdf); Filename: {app}\docs\TortoiseHg.pdf; Components: help  Name: {group}\TortoiseHg Web Site; Filename: {app}\TortoiseHg.url @@ -105,8 +92,6 @@
   [Run]  Filename: {app}\add_path.exe; Parameters: {app}; StatusMsg: Adding the installation path to the search path... -Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-win32.msi"" /qn /norestart ALLUSERS=1"; Components: shell; StatusMsg: Installing TortoiseOverlays.dll ... -Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-x64.msi"" /qn /norestart ALLUSERS=1"; Check: Is64BitInstallMode; Components: shell; StatusMsg: Installing TortoiseOverlays.dll ...    [UninstallRun]  Filename: {app}\add_path.exe; Parameters: /del {app} @@ -120,8 +105,9 @@
 Root: HKLM; Subkey: Software\Mercurial; Flags: uninsdeletekey; ValueData: {app}\Mercurial.ini    [Code] -const - wm_Close = $0010; + +var UserInfoPage: TInputQueryWizardPage; +var GetUserName: Boolean;    procedure FileExpandString(fn: String);  var @@ -136,38 +122,6 @@
  SaveStringsToFile(InFile, InFileLines, False);  end;   -var IsUpgrade: Boolean; - -function InitializeSetup(): Boolean; -var - ThgSwReg: String; - msg: String; - CRLF: String; -begin - CRLF := Chr(10) + Chr(13); - Result := True; - - {abort installation if TortoiseHg 0.7 or earlier is installed} - if RegQueryStringValue(HKLM, 'Software\TortoiseHg', '', ThgSwReg) then - begin - IsUpgrade := True; - {hgproc was removed after 0.7, so it's a good guess} - if (FileExists(ThgSwReg + '\hgproc.exe')) 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 versions of TortoiseHg and TortoiseOverlays,' + CRLF + - 'then run the installer again to continue.'; - MsgBox(msg, mbError, MB_OK); - Result := False; {quit and abort installation} - end; - end; -end; - -var UserInfoPage: TInputQueryWizardPage; -var GetUserName: Boolean; -  procedure InitializeWizard();  begin   if (not(FileExists(ExpandConstant('{%USERPROFILE}\Mercurial.ini')))) then @@ -208,60 +162,3 @@
  SaveStringsToFile(InFile, InFileLines, False);   end;  end; - -function ShouldSkipPage(PageID: Integer): Boolean; -begin - { Skip wpSelectDir page if upgrading; show all others } - case PageID of - wpSelectDir: - Result := IsUpgrade; - else - Result := False; - end; -end; - -function TerminateThgTaskbar(): Boolean; -var - TaskbarWindow: HWND; - TaskbarMutex: String; - tries: Integer; -begin - { Terminate thgtaskbar.exe if it is running. Returns True, if successful } - TaskbarMutex := 'thgtaskbar,Global\thgtaskbar'; - tries := 0; - while (tries < 4) and CheckForMutexes(TaskbarMutex) do begin - TaskbarWindow := FindWindowByWindowName('TortoiseHg RPC server'); - if TaskbarWindow <> 0 then - SendMessage(TaskbarWindow, wm_Close, 0, 0); - Sleep(3000 { ms }); - tries := tries + 1; - end; - Result := not CheckForMutexes(TaskbarMutex); -end; - -function PrepareToInstall: String; -begin - if TerminateThgTaskbar() then - Result := '' - else - Result := 'The installer failed to shut down thgtaskbar.exe, and will now close.'; -end; - -procedure CurUninstallStepChanged(step: TUninstallStep); -begin - if step = usAppMutexCheck then - TerminateThgTaskbar(); -end; - -function ShellInstallPossible(): Boolean; -begin - if not IsAdminLoggedOn then begin - SuppressibleMsgBox( - 'The shell integration install option (overlay icons, context menu) is unavailable (Administrator required)', - mbInformation, MB_OK, 0 - ); - Result := False; - end else Result := True; -end; - -#include "registry.iss"
Show Entire File contrib/​win32/​tortoisehg.iss Stacked
renamed from contrib/win32/mercurial.iss
(No changes)