Changeset 34677 in vbox

Timestamp:

Dec 3, 2010 8:20:16 AM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Use license file in RTF format, looks much nicer. Also supply the file on manual file extraction.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

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

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

@@ -169 +169 @@
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
         -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \
-        -E 'VBOX_BRAND_LICENSE_TXT=$(subst /,\,$(VBOX_BRAND_LICENSE_TXT))' \
         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),-E 'VBOX_BRAND_$(lang)_LICENSE_RTF=$(VBOX_BRAND_$(lang)_LICENSE_RTF)') \
         -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
@@ -232 +231 @@
                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
                         $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
-                        $(if $(VBOX_BRAND_LICENSE_TXT),'/DVBOX_WITH_LICENSE_INSTALL_TXT=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/VBoxGuestAdditions.nsi

@@ -21 +21 @@
 !define PRODUCT_UNINST_ROOT_KEY     "HKLM"
 
-!define LICENSE_FILE_TXT            "$INSTDIR\license.txt"
+!define LICENSE_FILE_RTF            "license.rtf"
 
 ; Needed for InstallLib macro: Install libraries in every case
@@ -550 +550 @@
   SetOverwrite on
 
-!ifdef VBOX_WITH_LICENSE_INSTALL_TXT
+!ifdef VBOX_WITH_LICENSE_INSTALL_RTF
   ; Copy license file (if any) into the installation directory
-  FILE /oname=${LICENSE_FILE_TXT} "$%VBOX_BRAND_LICENSE_TXT%"
+  FILE "/oname=${LICENSE_FILE_RTF}" "$%VBOX_BRAND_LICENSE_RTF%"
 !endif
 

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

@@ -8 +8 @@
   Push $0
   StrCpy "$0" "$INSTDIR\$%BUILD_TARGET_ARCH%"
+
+!ifdef VBOX_WITH_LICENSE_INSTALL_RTF
+  FILE "/oname=$0\${LICENSE_FILE_RTF}" "$%VBOX_BRAND_LICENSE_RTF%"
+!endif
 
   ; Video driver

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

@@ -80 +80 @@
 !endif
 
-!ifdef VBOX_WITH_LICENSE_INSTALL_TXT
-  Delete /REBOOTOK ${LICENSE_FILE_TXT}
+!ifdef VBOX_WITH_LICENSE_INSTALL_RTF
+  Delete /REBOOTOK "$INSTDIR\${LICENSE_FILE_RTF}"
 !endif