Changeset 96697 in vbox for trunk/src/VBox

Timestamp:

Sep 12, 2022 10:43:04 AM (2 years ago)

Author:

vboxsync

Message:

Add/Nt/Installer: Attempted build fixes and some comment updates.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (3 diffs)
• VBoxGuestAdditionsUninstallOld.nsh (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -132 +132 @@
   ; Welcome page
   !insertmacro MUI_PAGE_WELCOME
-!ifdef VBOX_WITH_LICENSE_DISPLAY
-  ; License page
-  !insertmacro MUI_PAGE_LICENSE "$(VBOX_LICENSE)"
-  !define MUI_LICENSEPAGE_RADIOBUTTONS
-!endif
+  !ifdef VBOX_WITH_LICENSE_DISPLAY
+     ; License page
+     !insertmacro MUI_PAGE_LICENSE "$(VBOX_LICENSE)"
+     !define MUI_LICENSEPAGE_RADIOBUTTONS
+  !endif
   ; Directory page
   !insertmacro MUI_PAGE_DIRECTORY
@@ -190 +190 @@
     Page directory
     Page instfiles
-!endif
+!endif ; !USE_MUI
 
 ; Must come after MUI includes to have certain defines set for DumpLog
@@ -1129 +1129 @@
 ;
 ; The uninstaller is built separately when doing code signing
-; For some reason NSIS still finds the Uninstall section even
-; when EXTERNAL_UNINSTALLER is defined. This causes a silly warning
+;
+; When building the non-uninstaller part, we get a 6020 warning because NSIS
+; detects uninstaller related _code_ (un.xxxx) being present.  It would take
+; some effort to eliminate that one.
 ;
 !ifndef EXTERNAL_UNINSTALLER

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstallOld.nsh

@@ -136 +136 @@
 !macroend
 !insertmacro Uninstall_WipeInstallationDirectory ""
-!insertmacro Uninstall_WipeInstallationDirectory "un."
 
 ; This function cleans up an old Sun installation
@@ -208 +207 @@
 !macroend
 !insertmacro Uninstall_Sun ""
-!insertmacro Uninstall_Sun "un."
 
 ; This function cleans up an old xVM Sun installation
@@ -280 +278 @@
 !macroend
 !insertmacro Uninstall_SunXVM ""
-!insertmacro Uninstall_SunXVM "un."
 
 ; This function cleans up an old innotek installation
@@ -371 +368 @@
 !macroend
 !insertmacro Uninstall_Innotek ""
-!insertmacro Uninstall_Innotek "un."