Skip to content

Commit 6aa5790

Browse files
committed
Minor formatting changes and test to see if AV will build with the rubberduck.dll rather than rubberduck.core.dll.
1 parent 4b65a82 commit 6aa5790

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

Rubberduck.Deployment/InnoSetup/Installer Build Script.iss

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define DllFullPath BuildDir + AddinDLL
1010
#define Tlb32bitFullPath BuildDir + Tlb32bit
1111
#define Tlb64bitFullPath BuildDir + Tlb64bit
12-
#define AppVersion GetFileVersion(BuildDir + "Rubberduck.Core.dll")
12+
#define AppVersion GetFileVersion(BuildDir + "Rubberduck.dll")
1313
#define AppPublisher "Rubberduck"
1414
#define AppURL "http://rubberduckvba.com"
1515
#define License SourcePath + "\License.rtf"
@@ -172,7 +172,8 @@ var
172172
#define AW "A"
173173
#endif
174174
175-
///<remarks>///Win32 API function used to launch a 2nd instance of the installer
175+
///<remarks>
176+
///Win32 API function used to launch a 2nd instance of the installer
176177
///under elevated context, used by <see cref="Elevate" />.
177178
///</remarks>
178179
function ShellExecute(hwnd: HWND; lpOperation: string; lpFile: string;
@@ -181,7 +182,8 @@ function ShellExecute(hwnd: HWND; lpOperation: string; lpFile: string;
181182
182183
// Helper functions section
183184
184-
///<remarks>///Encapuslate the check whether the installer is running in an
185+
///<remarks>
186+
///Encapuslate the check whether the installer is running in an
185187
///elevated context or not. This does not indicate whether the
186188
///installer was launched by a non-elevated installer, however.
187189
///<see cref="HasElevateSwitch" />
@@ -208,7 +210,8 @@ begin
208210
end;
209211
end;
210212
211-
///<remarks>///Used to determine whether a install directory that user
213+
///<remarks>
214+
///Used to determine whether a install directory that user
212215
///selected is in fact writable by the user, especially
213216
///for non-elevated installation.
214217
///</remarks>
@@ -242,6 +245,7 @@ end;
242245
///The original installer does not terminate but rather remains open for the
243246
///elevated install to complete so that the user can then proceed with VBE
244247
///addin registration on the <see cref="RegisterAddInOptionPage" /> page.
248+
///<remarks>
245249
function Elevate: Boolean;
246250
var
247251
I: Integer;
@@ -291,7 +295,7 @@ begin
291295
end;
292296
293297
///<remarks>
294-
///Adapated from http://kynosarges.org/DotNetVersion.html; used during
298+
///Adapted from http://kynosarges.org/DotNetVersion.html; used during
295299
///the <see cref="InitializeSetup"> event function to ensure that the
296300
///.NET framework is present on the computer.
297301
///</remarks>
@@ -412,7 +416,8 @@ begin
412416
result := ShouldInstallAllUsers and HasElevateSwitch;
413417
end;
414418
415-
///<remarks>///Helper function used in the File section to assess whether an
419+
///<remarks>
420+
///Helper function used in the File section to assess whether an
416421
///file(s) should be installed based on whether there's privilege
417422
///to do so. This guards against the case of both the non-elevated
418423
///installer and the elevated installer installing same files into
@@ -479,7 +484,8 @@ end;
479484
// that the Inno Setup will undergo for each event it calls. Note that
480485
// for certain events, it may be called more than once.
481486
482-
///<remarks>///This is the first event of the installer, fires prior to the wizard
487+
///<remarks>
488+
///This is the first event of the installer, fires prior to the wizard
483489
///being initialized. This is primarily used to validate that the
484490
///pre-requisites are met, in this case, pre-existence of .NET framework.
485491
///</remarks>
@@ -498,7 +504,8 @@ begin
498504
Result := True;
499505
end;
500506
501-
///<remarks>///The second event of installer allow us to customize the wizard by
507+
///<remarks>
508+
///The second event of installer allow us to customize the wizard by
502509
///assessing whether we were launched in elevated context from an
503510
///non-elevated installer; <see cref="HasElevateSwitch" />. We then
504511
///set up the <see cref="InstallForWhoOptionPage" /> and
@@ -652,7 +659,8 @@ begin
652659
end;
653660
end;
654661
655-
///<remarks>///The event function is called when wizard reaches the ready to install page.
662+
///<remarks>
663+
///The event function is called when wizard reaches the ready to install page.
656664
///Because we may or may not launch an elevated installer which will show similar
657665
///page, we need to help to make clear to the user what the installer(s) will be
658666
///doing by adding the extra custom messages accordingly to the page.
@@ -682,7 +690,8 @@ begin
682690
result := output;
683691
end;
684692
685-
///<remarks>///As a rule, the addin registration should be always uninstalled; there is no
693+
///<remarks>
694+
///As a rule, the addin registration should be always uninstalled; there is no
686695
///purpose in having the addin registered when the DLL gets uninstalled. Note
687696
///this is also unconditional - it will uninstall the related registry keys.
688697
///</remarks>

0 commit comments

Comments
 (0)