Changeset 98680 in vbox for trunk/src/VBox/Installer/darwin

Timestamp:

Feb 21, 2023 3:51:34 PM (2 years ago)

Author:

vboxsync

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

155980

Message:

Installer/*: Check VBOX_WITH_FE_AUTOSTART before assuming VBoxAutostart and service files are there. bugref:10030

File:

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

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

@@ -419 +419 @@
         $(if $(VBOX_WITH_FE_BUGREPORT),MacOS/VBoxBugReport) \
         $(if $(VBOX_WITH_FE_BALLOONCTRL),MacOS/VBoxBalloonCtrl) \
-        MacOS/VBoxAutostart \
+        $(if $(VBOX_WITH_FE_AUTOSTART),MacOS/VBoxAutostart) \
         $(if $(VBOX_WITH_WEBSERVICES),MacOS/vboxwebsrv) \
         $(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,) \
@@ -689 +689 @@
                 $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist,) \
                 $(if $(VBOX_WITH_FE_BALLOONCTRL),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxballoonctrl.plist) \
-                $(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxautostart.plist \
-                $(VBOX_PATH_DI_SRC)/VirtualBox/VBoxAutostartDarwin.sh \
+                $(if $(VBOX_WITH_FE_AUTOSTART),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxautostart.plist) \
+                $(if $(VBOX_WITH_FE_AUTOSTART),$(VBOX_PATH_DI_SRC)/VirtualBox/VBoxAutostartDarwin.sh) \
                 $(if-expr defined(VBOX_WITH_DTRACE), \
                         $(foreach f, $(VBOXINST_DTRACE_LIB_ARCH_FILES), \
@@ -769 +769 @@
         $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxballoonctrl.plist  $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/
 endif
+ifdef VBOX_WITH_FE_AUTOSTART
         $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxautostart.plist    $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/VBoxAutostartDarwin.sh                $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/
+endif
 # Install the python bridge stuff
 ifdef VBOX_WITH_PYTHON
@@ -864 +866 @@
         $(foreach file, $(if-expr defined(VBOX_WITH_WEBSERVICES),MacOS/org.virtualbox.vboxwebsrv.plist,) \
                         $(if-expr defined(VBOX_WITH_FE_BALLOONCTRL),MacOS/org.virtualbox.vboxballoonctrl.plist,) \
-                        MacOS/org.virtualbox.vboxautostart.plist \
-                        MacOS/VBoxAutostartDarwin.sh \
+                        $(if-expr defined(VBOX_WITH_FE_AUTOSTART),MacOS/org.virtualbox.vboxautostart.plist,) \
+                        $(if-expr defined(VBOX_WITH_FE_AUTOSTART),MacOS/VBoxAutostartDarwin.sh,) \
                         $(if-expr defined(VBOX_WITH_PYTHON),$(addprefix MacOS/, $(VBOX_DI_VBAPP_PYTHON_FILES) vboxshell.py),) \
                         $(if-expr defined(VBOX_WITH_JXPCOM),MacOS/sdk/bindings/xpcom/java/vboxjxpcom.jar,) \
@@ -1018 +1020 @@
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxBalloonCtrl "$$@"'
 endif
+ifdef VBOX_WITH_FE_AUTOSTART
         $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxAutostart \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart "$$@"'
+endif
 ifdef VBOX_WITH_DTRACE
         $(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxDTrace \