Changeset 86765 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Oct 30, 2020 10:45:12 AM (4 years ago)

Author:

vboxsync

Message:

Windows host installer: Respect / handle VBOX_WITH_HEADLESS.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (1 diff)

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

@@ -660 +660 @@
                 -E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
                 -E 'VBOX_WITH_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
+                -E 'VBOX_WITH_HEADLESS=$(if $(VBOX_WITH_HEADLESS),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)' \
@@ -814 +815 @@
                 -E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
                 -E 'VBOX_WITH_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
+                -E 'VBOX_WITH_HEADLESS=$(if $(VBOX_WITH_HEADLESS),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)' \

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

@@ -219 +219 @@
         <File Id="file_VBoxManage.exe" Name="VBoxManage.exe"
               Source="$(env.PATH_OUT)\bin\VBoxManage.exe" />
+<?if $(env.VBOX_WITH_HEADLESS) = "yes" ?>
         <File Id="file_VBoxHeadless.exe" Name="VBoxHeadless.exe"
               Source="$(env.PATH_OUT)\bin\VBoxHeadless.exe" />
-<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+ <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
         <File Id="file_VBoxHeadless.dll" Name="VBoxHeadless.dll"
               Source="$(env.PATH_OUT)\bin\VBoxHeadless.dll">
         </File>
+ <?endif ?>
 <?endif ?>
         <File Id="file_VBoxBalloonCtrl.exe" Name="VBoxBalloonCtrl.exe"