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

Timestamp:

Jan 14, 2019 4:17:07 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk, HostDrivers/Support, Main, FE/Qt, Installer: bugref:9049: Wipe out VBOX_GUI_WITH_SHARED_LIBRARY, leaving split GUI build as the only possible.

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (4 diffs)
• VirtualBox/postflight (modified) (1 diff)

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

@@ -407 +407 @@
 endif
 ifdef VBOX_WITH_HARDENING
- ifndef VBOX_GUI_WITH_SHARED_LIBRARY
-  VBOX_DI_VBAPP_DYLIBS += \
-        MacOS/VirtualBox.dylib \
-        MacOS/VBoxNetDHCP.dylib \
-        MacOS/VBoxNetNAT.dylib \
-        MacOS/VBoxHeadless.dylib
- else
-  VBOX_DI_VBAPP_DYLIBS += \
-        MacOS/VBoxGlobal.dylib \
-        MacOS/VirtualBoxVM.dylib \
-        MacOS/VBoxNetDHCP.dylib \
-        MacOS/VBoxNetNAT.dylib \
-        MacOS/VBoxHeadless.dylib
- endif
+ VBOX_DI_VBAPP_DYLIBS += \
+        MacOS/VBoxGlobal.dylib \
+        MacOS/VirtualBoxVM.dylib \
+        MacOS/VBoxNetDHCP.dylib \
+        MacOS/VBoxNetNAT.dylib \
+        MacOS/VBoxHeadless.dylib
 endif
 ifdef VBOX_WITH_HDDPARALLELS_INSTALL
@@ -786 +778 @@
         sudo chmod u+s $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/VBoxNetAdpCtl
 ifdef VBOX_WITH_HARDENING
- ifndef VBOX_GUI_WITH_SHARED_LIBRARY
-        sudo chmod u+s \
-                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetDHCP VBoxNetNAT,\
-                        $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/$(bin))
- else
         sudo chmod u+s \
                 $(foreach bin,VBoxHeadless VirtualBoxVM VBoxNetDHCP VBoxNetNAT,\
                         $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/$(bin))
- endif
 endif
         @# Do keyword replacement in the package info and description files.
@@ -809 +795 @@
         @# Copy the resources.
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/preflight                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
-if defined(VBOX_WITH_HARDENING) && !defined(VBOX_GUI_WITH_SHARED_LIBRARY)
+ifdef VBOX_WITH_HARDENING
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
 else
-        $(SED)  $(if-expr !defined(VBOX_WITH_HARDENING),-e '/WITH_HARDENING/d',) \
-                $(if-expr !defined(VBOX_GUI_WITH_SHARED_LIBRARY),-e '/WITH_SHARED_LIBRARY/d',-e '/WITHOUT_SHARED_LIBRARY/d') \
-                --output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight \
-                $(VBOX_PATH_DI_SRC)/VirtualBox/postflight
+        $(SED) -s '/WITH_HARDENING/d' -o $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight $(VBOX_PATH_DI_SRC)/VirtualBox/postflight
         $(CHMOD) 0755 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight
 endif
@@ -874 +857 @@
         $(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VirtualBox \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VirtualBox "$$@"'
-ifdef VBOX_GUI_WITH_SHARED_LIBRARY
         $(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VirtualBoxVM \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VirtualBoxVM "$$@"'
-endif
         $(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxManage \
                 '#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxManage "$$@"'

trunk/src/VBox/Installer/darwin/VirtualBox/postflight

@@ -92 +92 @@
 SET_UID_BINARIES="VBoxNetAdpCtl"
 SET_UID_BINARIES="${SET_UID_BINARIES} VBoxHeadless VirtualBoxVM VBoxNetDHCP VBoxNetNAT" # WITH_HARDENING
-SET_UID_BINARIES="${SET_UID_BINARIES} VirtualBox"                                       # WITH_HARDENING WITHOUT_SHARED_LIBRARY
 for bin in ${SET_UID_BINARIES}; do
     chmod u+s "/Applications/VirtualBox.app/Contents/MacOS/${bin}"