Changeset 34635 in vbox

Timestamp:

Dec 2, 2010 5:39:57 PM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions: Ship with GPLv2 license.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestAdditions.nsi (modified) (2 diffs)
• 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)' \
@@ -231 +232 @@
                         $(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') \
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
                         '$(subst /,\,$<)'

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

@@ -20 +20 @@
 !define PRODUCT_UNINST_KEY          "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY     "HKLM"
+
+!define LICENSE_FILE_TXT            "$INSTDIR\license.txt"
 
 ; Needed for InstallLib macro: Install libraries in every case
@@ -547 +549 @@
   SetOutPath "$INSTDIR"
   SetOverwrite on
+
+!ifdef VBOX_WITH_LICENSE_INSTALL_TXT
+  ; Copy license file (if any) into the installation directory
+  FILE /oname=${LICENSE_FILE_TXT} "$%VBOX_BRAND_LICENSE_TXT%"
+!endif
 
   FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"

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

@@ -80 +80 @@
 !endif
 
+!ifdef VBOX_WITH_LICENSE_INSTALL_TXT
+  Delete /REBOOTOK ${LICENSE_FILE_TXT}
+!endif
+
   Delete /REBOOTOK "$INSTDIR\VBoxGINA.dll"
   Delete /REBOOTOK "$INSTDIR\iexplore.ico"