Changeset 35659 in vbox for trunk

Timestamp:

Jan 20, 2011 4:49:12 PM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Also apply license file handling to uninstaller.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• VBoxGuestAdditionsUninstall.nsh (modified) (1 diff)

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

@@ -192 +192 @@
         -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),1,0)' \
         -E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
+        -E 'VBOX_WITH_LICENSE_INSTALL_RTF=$(if $(VBOX_BRAND_LICENSE_RTF),1,0)' \
         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM_ENABLED),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
@@ -257 +258 @@
                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
                         $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
-                        $(if $(VBOX_BRAND_LICENSE_RTF),'/DVBOX_WITH_LICENSE_INSTALL_RTF=1') \
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
                         '$(subst /,\,$<)'

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

@@ -9 +9 @@
   StrCpy "$0" "$INSTDIR\$%BUILD_TARGET_ARCH%"
 
-!ifdef VBOX_WITH_LICENSE_INSTALL_RTF
+!if $%VBOX_WITH_LICENSE_INSTALL_RTF% == "1"
   FILE "/oname=$0\${LICENSE_FILE_RTF}" "$%VBOX_BRAND_LICENSE_RTF%"
 !endif

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

@@ -16 +16 @@
 !endif
 
-!ifdef VBOX_WITH_LICENSE_INSTALL_RTF
+!if $%VBOX_WITH_LICENSE_INSTALL_RTF% == "1"
   Delete /REBOOTOK "$INSTDIR\${LICENSE_FILE_RTF}"
 !endif