Changeset 96776 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 16, 2022 11:58:49 PM (2 years ago)

Author:

vboxsync

Message:

Add/Nt/Installer: More work related to iexplore.ico removal as it seems it really was needed when we use a .lnk to point to the .url file in the install dir, now I've changed it to generate an identical Website.url file for the start menu too. This way we get the right browser icon associated .url files.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestAdditions.nsi (modified) (1 diff)
• VBoxGuestAdditionsUninstall.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -462 +462 @@
         $(VBOX_WINDOWS_ADDITIONS_ICON_FILE)=>VirtualBoxGA-vista.ico \
         $(VBOX_NSIS_ICON_FILE)=>VirtualBoxGA-nsis.ico \
-        iexplore.ico \
         $(PATH_ROOT)/doc/License-gpl-3.0.rtf \
         VBoxGuestAdditions.nsi \

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

@@ -806 +806 @@
 Section /o $(VBOX_COMPONENT_STARTMENU) SEC04
 
+  Delete /REBOOTOK "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" ; Changed to Website.url in r153663, so remove the old one
+
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  WriteIniStr    "$SMPROGRAMS\${PRODUCT_NAME}\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
 

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

@@ -53 +53 @@
 
   ; Delete desktop & start menu entries
-  Delete "$DESKTOP\${PRODUCT_NAME} Guest Additions.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_NAME} Guest Additions\Uninstall.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_NAME} Guest Additions\Website.lnk"
-  RMDIR "$SMPROGRAMS\${PRODUCT_NAME} Guest Additions"
+  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"            ; Obsolete. We don't install a desktop link any more.
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.url"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" ; Old name. Changed to Website.url in r153663.
+  RMDir  "$SMPROGRAMS\${PRODUCT_NAME}"
 
   ; Delete Guest Additions directory (only if completely empty)