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

iss: bundle x32 and x64 vcredist packages

Changeset aeff6f410c78

Parent 1e087bf4fa46

by Steve Borho

Changes to one file · Browse files at aeff6f410c78 Showing diff from parent 1e087bf4fa46 Diff from another changeset...

 
61
62
63
 
 
64
65
66
 
76
77
78
 
 
79
80
81
 
94
95
96
97
98
 
 
99
100
101
 
106
107
108
 
 
 
 
 
 
109
110
111
112
 
 
113
 
114
115
116
117
118
119
 
 
 
 
 
 
 
 
 
 
 
 
120
 
 
 
 
121
122
123
 
61
62
63
64
65
66
67
68
 
78
79
80
81
82
83
84
85
 
98
99
100
 
 
101
102
103
104
105
 
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
 
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
@@ -61,6 +61,8 @@
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt  Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt  Source: ..\icons\hgicon.ico; DestDir: {app} +Source: ..\contrib\vcredist_x86.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode +Source: ..\contrib\vcredist_x64.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode    Source: ..\files\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete  Source: ..\files\ThgShellia64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete @@ -76,6 +78,8 @@
 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"; Check: not Is64BitInstallMode; StatusMsg: Installing TortoiseOverlays.dll ...  Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-x64.msi"" /qn /norestart ALLUSERS=1"; Check: Is64BitInstallMode; StatusMsg: Installing TortoiseOverlays.dll ... @@ -94,8 +98,8 @@
 [Code]  procedure FileExpandString(fn: String);  var - InFile: String; - i: Integer; + InFile: String; + i: Integer;   InFileLines: TArrayOfString;  begin   InFile := ExpandConstant(fn); @@ -106,18 +110,42 @@
 end;    var IsUpgrade: Boolean; +var SP1Missing: Boolean; + +function ShouldInstallVCPPSP1(): Boolean; +begin + Result := SP1Missing; +end;    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; + 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; + + {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;    function ShouldSkipPage(PageID: Integer): Boolean;