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

Merge with stable

Changeset 050c73f8d76e…

Parents 56120d3f682a…

Parents cc932a768df0…

by Steve Borho

Changes to 2 files · Browse files at 050c73f8d76e Showing diff from parent 56120d3f682a cc932a768df0 Diff from another changeset...

Change 1 of 1 Show Entire File .hgtags Stacked
 
25
26
27
 
 
25
26
27
28
@@ -25,3 +25,4 @@
 33dc0a0820f2fd2c4cc2f49bad0b15c9b465db1a 0.8.2  cd50b769e235833ef490eb1847d2099fb4ea74e0 0.8.3  400e85fa0b8442af109d00081e8840359f095a67 0.9 +e5f7c3a255ef88c33b28350b2c9ac0e04ce4048d 0.9.1
Change 1 of 4 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
57
58
59
60
61
 
 
 
62
63
64
65
66
67
 
 
68
69
70
71
72
73
74
75
 
 
76
77
78
79
80
 
81
82
83
 
84
85
86
 
101
102
103
104
105
106
107
108
 
136
137
138
139
140
141
142
143
144
145
146
147
 
168
169
170
171
172
173
174
175
176
177
 
57
58
59
 
 
60
61
62
63
64
65
66
 
 
67
68
69
70
71
72
73
74
 
 
75
76
77
78
79
80
 
81
82
83
 
84
85
86
87
 
102
103
104
 
 
105
106
107
 
135
136
137
 
 
 
 
 
 
138
139
140
 
161
162
163
 
 
 
 
164
165
166
@@ -57,30 +57,31 @@
 Source: ..\build-hg\contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme  Source: ..\build-hg\templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs  Source: ..\build-hg\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs -Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n; Flags: -Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Flags: ; Components: help +Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n +Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Flags: ignoreversion; Components: help +Source: ..\build-hg\doc\style.css; DestDir: {app}\docs; Flags: ignoreversion; Components: help  Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall  Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')  Source: contrib\win32\mercurialuser.ini; DestDir: {%USERPROFILE}; DestName: Mercurial.ini; AfterInstall: FileExpandStringEx('{%USERPROFILE}\Mercurial.ini'); Flags: onlyifdoesntexist  Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt -Source: ..\contrib\*.exe; DestDir: {app}; Flags: -Source: ..\contrib\*.dll; DestDir: {app}; Flags: +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: ; Components: help -Source: doc\build\chm\*.chm; DestDir: {app}/docs; Flags: ; Components: help +Source: doc\build\pdf\*.pdf; DestDir: {app}/docs; Flags: ignoreversion; Components: help +Source: doc\build\chm\*.chm; DestDir: {app}/docs; Flags: ignoreversion; Components: help  Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs  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: 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; Components: hgbook +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 @@ -101,8 +102,6 @@
 Name: {group}\Uninstall TortoiseHg; Filename: {uninstallexe}    [Run] -;Filename: {tmp}\vcredist_x86.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode -;Filename: {tmp}\vcredist_x64.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode  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 ... @@ -136,12 +135,6 @@
 end;    var IsUpgrade: Boolean; -var SP1Missing: Boolean; - -function ShouldInstallVCPPSP1(): Boolean; -begin - Result := SP1Missing; -end;    function InitializeSetup(): Boolean;  var @@ -168,10 +161,6 @@
  Result := False; {quit and abort installation}   end;   end; - - {Detect whether VC2005-SP1 Redistributable package is installed} - if (not(RegValueExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'SP'))) then - SP1Missing := True;  end;    var UserInfoPage: TInputQueryWizardPage;