Changeset 76010 in vbox

Timestamp:

Dec 6, 2018 11:17:50 AM (6 years ago)

Author:

vboxsync

Message:

Installer/darwin: Integrate the OS X fuse core package into our installer for the image mounter and enable integration for darwin

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (2 diffs)
• src/VBox/Installer/darwin/VirtualBox_mpkg/Localizable.strings (modified) (1 diff)
• src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist (modified) (2 diffs)

trunk/Config.kmk

@@ -832 +832 @@
 if1of ($(KBUILD_TARGET), darwin)
  VBOX_WITH_VBOXIMGMOUNT = 1
+endif
+# Set this to enable packaging the fuse related bits into our installer.
+if1of ($(KBUILD_TARGET), darwin)
+ VBOX_WITH_FUSE_PACKING = 1
 endif
 ## @}

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

@@ -178 +178 @@
                             $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \
                 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)) \
+                $(if $(VBOX_WITH_FUSE_PACKING), $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg) \
                 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
         $(call MSG_TOOL,productbuild,,,$@)
@@ -928 +929 @@
                 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res
 
+ifdef VBOX_WITH_FUSE_PACKING
+#
+# The OS X fuse core package.
+#
+$(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg: \
+                $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg
+        $(call MSG_TOOL,Preparing OS X Fuse core package,,,$@)
+        @# Cleanup any previously failed attempts.
+        sudo rm -Rf $@
+        pkgutil --flatten $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg $@
+endif
+
 
 #

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Localizable.strings

@@ -10 +10 @@
 'choiceVBoxCLI_msg' = 'Installs the @VBOX_PRODUCT@ command line utilities into /usr/bin.';
 
+'choiceOSXFuseCore_title' = 'OS X Fuse core package';
+'choiceOSXFuseCore_msg' = 'Installs the OS X Fuse core package for the image mounter.';
+
 'RUNNING_VMS_TLE' = "Running VirtualBox virtual machines detected!";
 'RUNNING_VMS_MSG' = "The installer has detected running virtual machines. Please shut down all running VirtualBox machines and then restart the installation.";

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist

@@ -109 +109 @@
         <line choice="choiceVBox"></line>
         <line choice="choiceVBoxCLI"></line>
+        <line choice="choiceOSXFuseCore"></line>
     </choices-outline>
     <choice id="choiceVBoxKEXTs"   title="choiceVBoxKEXTs_title"   description="choiceVBoxKEXTs_msg"   start_selected="true" start_enabled="false" start_visible="true">
@@ -119 +120 @@
         <pkg-ref id="org.virtualbox.pkg.virtualboxcli"></pkg-ref>
     </choice>
+    <choice id="choiceOSXFuseCore" title="choiceOSXFuseCore_title" description="choiceOSXFuseCore_msg" start_selected="true" start_enabled="true" start_visible="true">
+        <pkg-ref id="com.github.osxfuse.pkg.Core"></pkg-ref>
+    </choice>
     <pkg-ref id="org.virtualbox.pkg.vboxkexts" auth="Root">file:./Contents/Packages/VBoxKEXTs.pkg</pkg-ref>
     <pkg-ref id="org.virtualbox.pkg.virtualbox" auth="Root">file:./Contents/Packages/VirtualBox.pkg</pkg-ref>
     <pkg-ref id="org.virtualbox.pkg.virtualboxcli" auth="Root">file:./Contents/Packages/VirtualBoxCLI.pkg</pkg-ref>
+    <pkg-ref id="com.github.osxfuse.pkg.Core" auth="Root">file:./Contents/Packages/OSXFuseCore.pkg</pkg-ref>
 </installer-gui-script>