Changeset 96693 in vbox

Timestamp:

Sep 12, 2022 8:40:05 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153576

Message:

Add/Nt/Installer: Reduce the number of warnings a little.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (6 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (6 diffs)
• VBoxGuestAdditionsNT4.nsh (modified) (1 diff)
• VBoxGuestAdditionsUninstall.nsh (modified) (2 diffs)
• VBoxGuestAdditionsUninstallOld.nsh (modified) (2 diffs)
• VBoxGuestAdditionsVista.nsh (modified) (1 diff)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

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

@@ -95 +95 @@
 !include "Sections.nsh"
 !include "strstr.nsh"         ; Function "strstr"
-!include "servicepack.nsh"    ; Function "GetServicePack"
+!if $%KBUILD_TARGET_ARCH% == "x86" ; Only needed for NT4 SP6 recommendation.
+  !include "servicepack.nsh"  ; Function "GetServicePack"
+!endif
 !include "winver.nsh"         ; Function for determining Windows version
 !define REPLACEDLL_NOREGISTER ; Replace in use DLL function
@@ -266 +268 @@
 !include "VBoxGuestAdditionsVista.nsh"
 !include "VBoxGuestAdditionsUninstall.nsh"    ; Product uninstallation
-!include "VBoxGuestAdditionsUninstallOld.nsh" ; Uninstallation of deprecated versions which must be removed first
+!ifndef UNINSTALLER_ONLY
+  !include "VBoxGuestAdditionsUninstallOld.nsh" ; Uninstallation of deprecated versions which must be removed first
+!endif
 
 Function HandleCommandLine
@@ -488 +492 @@
 FunctionEnd
 
+!ifndef UNINSTALLER_ONLY
+
 Function CheckForOldGuestAdditions
 
@@ -494 +500 @@
   Push $2
 
-begin:
-
   ${LogVerbose} "Checking for old Guest Additions ..."
-
-sun_check:
 
   ; Check for old "Sun VirtualBox Guest Additions"
@@ -603 +605 @@
 
 FunctionEnd
+
+!endif ; UNINSTALLER_ONLY
 
 ;
@@ -1203 +1207 @@
 SectionEnd
 
-; !EXTERNAL_UNINSTALLER
-!endif
+!endif ; !EXTERNAL_UNINSTALLER
 
 ;Direct the output to our bin dir

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

@@ -269 +269 @@
 !insertmacro GetWindowsVersionEx "un."
 
+!ifndef UNINSTALLER_ONLY
 !macro GetAdditionsVersion un
 Function ${un}GetAdditionsVersion
@@ -333 +334 @@
 !insertmacro GetAdditionsVersion ""
 !insertmacro GetAdditionsVersion "un."
+!endif ; UNINSTALLER_ONLY
 
 !macro StopVBoxService un
@@ -345 +347 @@
   ${LogVerbose} "Stopping VBoxService ..."
 
-svc_stop:
-
   ${LogVerbose} "Stopping VBoxService via SCM ..."
   ${If} $g_strWinVersion == "NT4"
@@ -355 +355 @@
   Sleep "1000"           ; Wait a bit
 
-exe_stop:
-
 !ifdef _DEBUG
   ${LogVerbose} "Stopping VBoxService (as exe) ..."
@@ -463 +461 @@
 !macroend
 
+!ifdef UNUSED_CODE ; Only used by unused Uninstall_RunExtUnInstaller function in VBoxguestAdditionsUninstallOld.nsh.
 !macro AbortShutdown un
 Function ${un}AbortShutdown
@@ -477 +476 @@
 !insertmacro AbortShutdown ""
 !insertmacro AbortShutdown "un."
+!endif ; UNUSED_CODE
 
 ;;

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

@@ -235 +235 @@
 FunctionEnd
 !macroend
-!insertmacro NT4_UninstallInstDir ""
+;!insertmacro NT4_UninstallInstDir "" - only .un version used
 !insertmacro NT4_UninstallInstDir "un."
 

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

@@ -74 +74 @@
 FunctionEnd
 !macroend
-!insertmacro UninstallCommon ""
+;!insertmacro UninstallCommon "" - only .un version used
 !insertmacro UninstallCommon "un."
 
@@ -196 +196 @@
 FunctionEnd
 !macroend
-!insertmacro UninstallInstDir ""
+;!insertmacro UninstallInstDir "" - only un. version is used.
 !insertmacro UninstallInstDir "un."

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

@@ -26 +26 @@
 ;
 
+!ifdef UNUSED_CODE
 !macro Uninstall_RunExtUnInstaller un
 Function ${un}Uninstall_RunExtUnInstaller
@@ -91 +92 @@
 !insertmacro Uninstall_RunExtUnInstaller ""
 !insertmacro Uninstall_RunExtUnInstaller "un."
+!endif ; UNUSED_CODE
 
 !macro Uninstall_WipeInstallationDirectory un

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

@@ -99 +99 @@
 FunctionEnd
 !macroend
-!insertmacro Vista_UninstallInstDir ""
+;!insertmacro Vista_UninstallInstDir "" - only .un version used
 !insertmacro Vista_UninstallInstDir "un."
 

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

@@ -650 +650 @@
 FunctionEnd
 !macroend
-!insertmacro W2K_UninstallInstDir ""
+;!insertmacro W2K_UninstallInstDir "" - only .un version used
 !insertmacro W2K_UninstallInstDir "un."