Changeset 84945 in vbox for trunk/src/VBox/Installer

Timestamp:

Jun 25, 2020 10:22:05 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138819

Message:

Installer/win,GA/NT/Installer: Stop using obsolete kBuild variable names.

Location:

trunk/src/VBox/Installer/win

Files:

• Defines.wxi (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• Scripts/Combined-3-RepackAdditions.cmd (modified) (2 diffs)
• VirtualBox.wxs (modified) (2 diffs)

trunk/src/VBox/Installer/win/Defines.wxi

@@ -24 +24 @@
   <?define Property_VersionExt = "$(env.VBOX_VERSION_STRING)" ?>
 
-  <?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
+  <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
       <?define Property_ProgramFiles = "ProgramFiles64Folder" ?>
       <?define Property_Platform     = "x64" ?>

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -678 +678 @@
                 -E 'VBOX_WITH_VBOX_IMG=$(if $(VBOX_WITH_VBOX_IMG)$(VBOX_WITH_TESTCASES),yes,no)' \
                 -E 'VBOX_WITH_VBOXSDL=$(if $(VBOX_WITH_VBOXSDL),yes,no)' \
-                -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
-                -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
+                -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
+                -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
                 -E 'VBOX_INSTALLER_QUICK=$(VBOX_INSTALLER_QUICK)' \
                 -E 'VBOX_VCC_TOOL_STEM=$(VBOX_VCC_TOOL_STEM)' \
@@ -831 +831 @@
                 -E 'VBOX_WITH_VBOX_IMG=$(if $(VBOX_WITH_VBOX_IMG),yes,no)' \
                 -E 'VBOX_WITH_VBOXSDL=$(if $(VBOX_WITH_VBOXSDL),yes,no)' \
-                -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
-                -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
+                -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
+                -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
                 -E 'VBOX_INSTALLER_QUICK=$(VBOX_INSTALLER_QUICK)' \
                 -E 'VBOX_VCC_TOOL_STEM=$(VBOX_VCC_TOOL_STEM)' \

trunk/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd

@@ -235 +235 @@
         -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 "BUILD_TYPE=release" -E "BUILD_TARGET_ARCH=amd64" ^
+        -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" ^
         --  %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
                 "/DVBOX_SIGN_ADDITIONS=1" ^
@@ -266 +266 @@
         -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 "BUILD_TYPE=release" -E "BUILD_TARGET_ARCH=x86" ^
+        -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" ^
         --  %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
                 "/DVBOX_SIGN_ADDITIONS=1" ^

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -92 +92 @@
 
     <!-- Make sure installation will not start on anything other but the NT family -->
-<?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
+<?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     <Condition Message="!(loc.Only64Bit)">
         VersionNT64
@@ -180 +180 @@
 
     <!-- Figure out where a previous installation was, if any -->
-<?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
+<?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
     <CustomAction Id="ca_OriginalTargetDir" Execute="firstSequence" Property="INSTALLDIR"
                   Value="[ProgramFiles64Folder]\$(env.VBOX_VENDOR_SHORT)\VirtualBox" />