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

Timestamp:

Oct 30, 2020 11:13:46 AM (4 years ago)

Author:

vboxsync

Message:

Windows host installer: Respect / handle VBOX_WITH_FE_BALLOONCTRL, VBOX_WITH_FE_BUGREPORT and VBOX_WITH_FE_AUTOSTART. Also, only include VBoxTestOGL if VBOX_WITH_QTGUI *and* VBOX_WITH_VMSVGA3D / VBOX_WITH_VIDEOHWACCEL is set.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxMergeApp.wxi (modified) (2 diffs)

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

@@ -661 +661 @@
                 -E 'VBOX_WITH_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
                 -E 'VBOX_WITH_HEADLESS=$(if $(VBOX_WITH_HEADLESS),yes,no)' \
+                -E 'VBOX_WITH_FE_BALLOONCTRL=$(if $(VBOX_WITH_FE_BALLOONCTRL),yes,no)' \
+                -E 'VBOX_WITH_FE_AUTOSTART=$(if $(VBOX_WITH_FE_AUTOSTART),yes,no)' \
+                -E 'VBOX_WITH_FE_BUGREPORT=$(if $(VBOX_WITH_FE_BUGREPORT),yes,no)' \
                 -E 'VBOX_WITH_LICENSE_DISPLAY=$(if $(VBOX_WITH_LICENSE_DISPLAY),yes,no)' \
                 -E 'VBOX_WITH_MIDL_PROXY_STUB=$(if $(VBOX_WITH_MIDL_PROXY_STUB),yes,no)' \
@@ -679 +682 @@
                 -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 'VBOX_WITH_VMSVGA3D=$(if $(VBOX_WITH_VMSVGA3D),yes,no)' \
+                -E 'VBOX_WITH_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \
                 -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
@@ -816 +821 @@
                 -E 'VBOX_WITH_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
                 -E 'VBOX_WITH_HEADLESS=$(if $(VBOX_WITH_HEADLESS),yes,no)' \
+                -E 'VBOX_WITH_FE_BALLOONCTRL=$(if $(VBOX_WITH_FE_BALLOONCTRL),yes,no)' \
+                -E 'VBOX_WITH_FE_AUTOSTART=$(if $(VBOX_WITH_FE_AUTOSTART),yes,no)' \
+                -E 'VBOX_WITH_FE_BUGREPORT=$(if $(VBOX_WITH_FE_BUGREPORT),yes,no)' \
                 -E 'VBOX_WITH_LICENSE_DISPLAY=$(if $(VBOX_WITH_LICENSE_DISPLAY),yes,no)' \
                 -E 'VBOX_WITH_MIDL_PROXY_STUB=$(if $(VBOX_WITH_MIDL_PROXY_STUB),yes,no)' \
@@ -833 +841 @@
                 -E 'VBOX_WITH_VBOX_IMG=$(if $(VBOX_WITH_VBOX_IMG),yes,no)' \
                 -E 'VBOX_WITH_VBOXSDL=$(if $(VBOX_WITH_VBOXSDL),yes,no)' \
+                -E 'VBOX_WITH_VMSVGA3D=$(if $(VBOX_WITH_VMSVGA3D),yes,no)' \
+                -E 'VBOX_WITH_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \
                 -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \

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

@@ -228 +228 @@
  <?endif ?>
 <?endif ?>
+<?if $(env.VBOX_WITH_FE_BALLOONCTRL) = "yes" ?>
         <File Id="file_VBoxBalloonCtrl.exe" Name="VBoxBalloonCtrl.exe"
               Source="$(env.PATH_OUT)\bin\VBoxBalloonCtrl.exe"/>
+<?endif ?>
+<?if $(env.VBOX_WITH_FE_BUGREPORT) = "yes" ?>
         <File Id="file_VBoxBugReport.exe" Name="VBoxBugReport.exe"
               Source="$(env.PATH_OUT)\bin\VBoxBugReport.exe"/>
+<?endif ?>
+<?if $(env.VBOX_WITH_FE_AUTOSTART) = "yes" ?>
         <File Id="file_VBoxAutostartSvc.exe" Name="VBoxAutostartSvc.exe"
               Source="$(env.PATH_OUT)\bin\VBoxAutostartSvc.exe" />
+<?endif ?>
 <?if $(env.VBOX_WITH_VBOX_IMG) = "yes" ?>
         <File Id="file_vbox_img.exe" Name="vbox-img.exe"
               Source="$(env.PATH_OUT)\bin\vbox-img.exe"/>
 <?endif ?>
-
         <!-- Misc tools -->
         <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
@@ -350 +355 @@
               Source="$(env.PATH_OUT)\bin\VirtualBox_150px.png" />
 
+ <?if $(env.VBOX_WITH_VMSVGA3D) = "yes" or $(env.VBOX_WITH_VIDEOHWACCEL) = "yes" ?>
         <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"
-            Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
+              Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
+ <?endif ?>
 <?endif ?>
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>