16
16
#define AppVersion GetFileVersion(BuildDir + " Rubberduck.dll" )
17
17
#define AppPublisher " Rubberduck"
18
18
#define AppURL " http://rubberduckvba.com"
19
- #define License SourcePath + " \License.rtf"
19
+ #define License SourcePath + " \Includes\ License.rtf"
20
20
#define OutputDirectory SourcePath + " Installers\"
21
21
#define AddinProgId " Rubberduck.Extension"
22
22
#define AddinCLSID " 8D052AD8-BBD2-4C59-8DEC-F697CA1F8A66"
@@ -66,6 +66,7 @@ PrivilegesRequired=lowest
66
66
67
67
UninstallFilesDir = {app} \Installers
68
68
UninstallDisplayName = {code:GetUninstallDisplayName}
69
+ UninstallDisplayIcon = ducky.ico
69
70
Uninstallable = ShouldCreateUninstaller()
70
71
CreateUninstallRegKey = ShouldCreateUninstaller()
71
72
@@ -255,7 +256,6 @@ function HaveWriteAccessToApp: Boolean;
255
256
var
256
257
FileName: string;
257
258
begin
258
- {
259
259
FileName := AddBackslash(WizardDirValue) + ' writetest.tmp' ;
260
260
Result := SaveStringToFile(FileName, ' test' , False);
261
261
if Result then
@@ -269,8 +269,6 @@ begin
269
269
Log(Format(' Does not have write access to the last installation path [%s]' , [
270
270
WizardDirValue]));
271
271
end ;
272
- }
273
- Result := true;
274
272
end ;
275
273
276
274
// /<remarks>
@@ -286,7 +284,6 @@ function Elevate: Boolean;
286
284
var
287
285
I: Integer;
288
286
instance: HINSTANCE;
289
- waitSignal: DWORD;
290
287
Params: string;
291
288
S: string;
292
289
begin
@@ -553,12 +550,12 @@ begin
553
550
end ;
554
551
555
552
// /<remakrs>
556
- // /Provide a sufixed name of uninstaller to help identify what mode
553
+ // /Provide a suffixed name of uninstaller to help identify what mode
557
554
// /the version is installed in.
558
555
// /</remarks>
559
556
function GetUninstallDisplayName (Unused: string): string;
560
557
begin
561
- result := ExpandConstant(' {#AppName} (' ) + GetAppSuffix() + ' )' ;
558
+ result := ExpandConstant(' {#AppName} (' ) + GetAppSuffix() + ' ) {#AppVersion} ' ;
562
559
end ;
563
560
564
561
// /<remarks>
841
838
// /<remarks>
842
839
function NextButtonClick (CurPageID: Integer): Boolean;
843
840
var
844
- Params: string;
845
841
RetVal: HINSTANCE;
846
- Respone: integer;
847
842
UpgradeResult: integer;
848
843
begin
849
844
// Prevent accidental extra clicks
0 commit comments