Changeset 88183 in vbox

Timestamp:

Mar 18, 2021 9:52:39 AM (4 years ago)

Author:

vboxsync

Message:

Installer/darwin: Try just make stuff build without qt.

File:

• trunk/src/VBox/Installer/darwin/Makefile.kmk (modified) (6 diffs)

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

@@ -474 +474 @@
 
 VBOX_DI_VBAPP_UNIVERSAL_PROGS = \
-        MacOS/vmstarter \
         $(if $(VBOX_WITH_VBOX_IMG)$(VBOX_WITH_TESTCASES),MacOS/vbox-img,) \
         $(if $(VBOX_WITH_VBOXIMGMOUNT),MacOS/vboximg-mount,)
+ifdef VBOX_WITH_QTGUI
+ VBOX_DI_VBAPP_UNIVERSAL_PROGS += \
+        MacOS/vmstarter
+endif
 
 VBOX_DI_VBAPP_OTHER_UNIVERSAL_BINS = \
@@ -505 +508 @@
        $(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES) \
         MacOS/components/VBoxXPCOMBase.xpt \
-        MacOS/components/VirtualBox_XPCOM.xpt \
-        Resources/vmstarter.app/Contents/Info.plist \
-        Resources/vmstarter.app/Contents/PkgInfo \
-       $(addprefix Resources/vmstarter.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES))
+        MacOS/components/VirtualBox_XPCOM.xpt
 ifdef VBOX_WITH_QTGUI # Yeah, the output w/o the qt gui is a bit useless. But we just want it building now.
  VBOX_DI_VBAPP_MISC_FILES += \
@@ -515 +515 @@
         Resources/VirtualBoxVM.app/Contents/Info.plist \
         Resources/VirtualBoxVM.app/Contents/PkgInfo \
-        $(addprefix Resources/VirtualBoxVM.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES))
+        $(addprefix Resources/VirtualBoxVM.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES)) \
+        Resources/vmstarter.app/Contents/Info.plist \
+        Resources/vmstarter.app/Contents/PkgInfo \
+        $(addprefix Resources/vmstarter.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES))
 endif
 ifdef VBOX_WITH_DOCS_PACKING
@@ -532 +535 @@
         MacOS/VBoxEFI64.fd
 endif
-VBOX_DI_VBAPP_SYMLINKS = \
-        Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/
+VBOX_DI_VBAPP_SYMLINKS =
 ifdef VBOX_WITH_QTGUI
  VBOX_DI_VBAPP_DYLIBS += \
@@ -544 +546 @@
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/Info.plist)
  VBOX_DI_VBAPP_SYMLINKS += \
+        Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
         ,Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_VERSION_MAJOR) )
@@ -756 +759 @@
         $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app,,$(if-expr defined(VBOX_WITH_MACOS_HARDENED_RUNTIME)\
                 ,--entitlements="$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlements.plist",))
+ ifdef VBOX_WITH_QTGUI
         $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/vmstarter.app,,)
+ endif
         $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP),,--deep)
  ifdef VBOX_WITH_MACOS_HARDENED_RUNTIME # HACK ALERT! --deep fries the entitlements, so redo w/o --deep now.