summaryrefslogtreecommitdiff
path: root/src/VBox/Installer
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2022-08-04 20:55:51 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2022-08-04 20:55:51 +0000
commit8abf855219125a2008405d2c775e11cbd31755ab (patch)
tree180286372f4933711e1b00931b299a0f959028ef /src/VBox/Installer
parent93adc5c208d0d22c194abbe52f84adbd0492aac7 (diff)
downloadVirtualBox-svn-8abf855219125a2008405d2c775e11cbd31755ab.tar.gz
COPYING, /Config.kmk, doc, installer: Update license files, now using GPLv3 (required for compatibility with license of Qt 5.7 and later). bugref:10229
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@96038 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Installer')
-rw-r--r--src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd b/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd
index dca0b28b2cf..a6c47ab25f7 100644
--- a/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd
+++ b/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd
@@ -234,7 +234,7 @@ rem TBD: that has to be converted to invoke auto-generated .cmd
-E "VBOX_NSIS_ICON_FILE=%_MY_OPT_SRC_DIR%\VirtualBoxGA-nsis.ico" ^
-E "VBOX_WITH_GUEST_INSTALL_HELPER=1" -E "VBOX_WITH_GUEST_INSTALLER_UNICODE=1" -E "VBOX_WITH_LICENSE_INSTALL_RTF=1" ^
-E "VBOX_WITH_WDDM=1" -E "VBOX_WITH_MESA3D=1" -E "VBOX_BRAND_WIN_ADD_INST_DLGBMP=%_MY_OPT_SRC_DIR%\welcome.bmp" ^
- -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-2.0.rtf" -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=amd64" ^
+ -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-3.0.rtf" -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=amd64" ^
-- %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
"/DVBOX_SIGN_ADDITIONS=1" ^
"/DEXTERNAL_UNINSTALLER=1" ^
@@ -265,7 +265,7 @@ rem TBD: that has to be converted to invoke auto-generated .cmd
-E "VBOX_NSIS_ICON_FILE=%_MY_OPT_SRC_DIR%\VirtualBoxGA-nsis.ico" ^
-E "VBOX_WITH_GUEST_INSTALL_HELPER=1" -E "VBOX_WITH_GUEST_INSTALLER_UNICODE=1" -E "VBOX_WITH_LICENSE_INSTALL_RTF=1" ^
-E "VBOX_WITH_WDDM=1" -E "VBOX_WITH_MESA3D=1" -E "VBOX_BRAND_WIN_ADD_INST_DLGBMP=%_MY_OPT_SRC_DIR%\welcome.bmp" ^
- -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-2.0.rtf" -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=x86" ^
+ -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-3.0.rtf" -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=x86" ^
-- %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
"/DVBOX_SIGN_ADDITIONS=1" ^
"/DEXTERNAL_UNINSTALLER=1" ^