Changeset 96775 in vbox

Timestamp:

Sep 16, 2022 11:39:31 PM (2 years ago)

Author:

vboxsync

Message:

Add/Nt/Installer: Removed iexplore.ico as it's not needed, except perhaps on NT4.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (4 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
• VBoxGuestAdditionsUninstall.nsh (modified) (4 diffs)
• iexplore.ico (deleted)

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

@@ -692 +692 @@
 
   ; Copy some common files ...
+  Call Common_CleanupObsoleteFiles
   Call Common_CopyFiles
 
@@ -704 +705 @@
 
   ; Copy some common files ...
+  Call Common_CleanupObsoleteFiles
   Call Common_CopyFiles
 
@@ -718 +720 @@
 
   ; Copy some common files ...
+  Call Common_CleanupObsoleteFiles
   Call Common_CopyFiles
 
@@ -804 +807 @@
 
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" "" "$INSTDIR\iexplore.ico"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
 

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

@@ -25 +25 @@
 ; SPDX-License-Identifier: GPL-3.0-only
 ;
+
+
+!macro Common_CleanupObsoleteFiles un
+;;
+; Removes common files we're no longer shipping.
+;
+; During installation this step should be taken before copy files over in case
+; the list gets out of sync and we start shipping files on it.  That way it
+; doesn't much matter as the file will be restore afterwards.
+;
+Function ${un}Common_CleanupObsoleteFiles
+  Delete /REBOOTOK "$INSTDIR\iexplore.ico"      ; Removed in r153662.
+FunctionEnd
+!macroend
+!insertmacro Common_CleanupObsoleteFiles ""
+!ifdef UNINSTALLER_ONLY
+  !insertmacro Common_CleanupObsoleteFiles "un."
+!endif
 
 Function Common_CopyFiles
@@ -47 +65 @@
   ${EndIf}
 !endif
-
-  FILE "iexplore.ico"
 
 FunctionEnd

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

@@ -47 +47 @@
 
   Delete /REBOOTOK "$INSTDIR\VBoxGINA.dll"
-  Delete /REBOOTOK "$INSTDIR\iexplore.ico"
 
   ; Delete registry keys
@@ -139 +138 @@
 !insertmacro Uninstall "un."
 
+;;
+; The last step of the uninstallation where we remove all files from the
+; install directory and such.
+;
 !macro UninstallInstDir un
 Function ${un}UninstallInstDir
@@ -165 +168 @@
   ${EndIf}
 
-  Goto notsupported
+  MessageBox MB_ICONSTOP $(VBOX_PLATFORM_UNSUPPORTED) /SD IDOK
+  Goto exit
 
 !if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
@@ -185 +189 @@
   goto common
 
-notsupported:
-
-  MessageBox MB_ICONSTOP $(VBOX_PLATFORM_UNSUPPORTED) /SD IDOK
-  Goto exit
-
 common:
 
+  Call ${un}Common_CleanupObsoleteFiles
+
+  ; This will attempt remove the install dir, so must be last.
   Call ${un}UninstallCommon