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

Timestamp:

Nov 23, 2010 11:08:52 AM (14 years ago)

Author:

vboxsync

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

68023

Message:

FE/Qt4; Installer-OSX; Resources: add handling of file type association

Location:

trunk/src/VBox/Installer/darwin

Files:

• DiskImage/VirtualBox_Uninstall.tool (modified) (1 diff)
• Makefile.kmk (modified) (5 diffs)
• VirtualBox/postflight (modified) (2 diffs)

trunk/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool

@@ -164 +164 @@
 
 #
+# Unregister has to be done before the files are removed.
+#
+LSREGISTER=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister
+if [ -e ${LSREGISTER} ]; then
+    ${LSREGISTER} -u /Applications/VirtualBox.app > /dev/null
+    ${LSREGISTER} -u /Applications/VirtualBox.app/Contents/Resources/vmstarter.app > /dev/null
+fi
+
+#
 # Display the sudo usage instructions and execute the command.
 #

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

@@ -647 +647 @@
         MacOS/VMMR0.r0 \
         MacOS/VBoxDDR0.r0 \
-        MacOS/VBoxDD2R0.r0
+        MacOS/VBoxDD2R0.r0 \
+        MacOS/vmstarter
 
 VBOX_DI_VBAPP_OTHER_BINS = \
@@ -657 +658 @@
         Resources/VirtualBoxVM.app/Contents/Info.plist \
         Resources/VirtualBoxVM.app/Contents/PkgInfo \
+        Resources/vmstarter.app/Contents/Info.plist \
+        Resources/vmstarter.app/Contents/PkgInfo \
         Info.plist \
         PkgInfo \
         Resources/virtualbox.icns \
+        Resources/virtualbox-vbox.icns \
+        Resources/virtualbox-vbox-extpack.icns \
+        Resources/virtualbox-ovf.icns \
+        Resources/virtualbox-ova.icns \
         MacOS/components/VBoxXPCOMBase.xpt \
         MacOS/components/VirtualBox_XPCOM.xpt
@@ -687 +694 @@
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
         Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \
+        Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
+        Resources/vmstarter.app/Contents/Resources=>../../../Resources/ \
         $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
 ifdef VBOX_WITH_COCOA_QT
@@ -733 +742 @@
                 $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents/Resources/*) \
                 $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents/Resources/*.lproj/*) \
+                $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/vmstarter.app/Contents/*) \
+                $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/vmstarter.app/Contents/Resources/*) \
+                $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/vmstarter.app/Contents/Resources/*.lproj/*) \
                 $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/Resources/*.lproj/*) \
                 $$(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/*) \
@@ -766 +778 @@
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app \
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents \
+                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/vmstarter.app \
+                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/vmstarter.app/Contents \
                 $(if-expr defined(VBOX_WITH_PYTHON), \
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/sdk \

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

@@ -67 +67 @@
 VBOXWEBSRV_TRG="${HOME}/Library/LaunchAgents"
 if [[ -e "${VBOXWEBSRV}" && -e "${VBOXWEBSRV_TRG}" ]]; then
-   echo "Installing vboxwebsrv launchd file to ${VBOXWEBSRV_TRG}"
-   ${CP} "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/"
-   /usr/sbin/chown `/usr/bin/stat -f"%u" "${HOME}"` "${VBOXWEBSRV_TRG}/org.virtualbox.vboxwebsrv.plist"
+    echo "Installing vboxwebsrv launchd file to ${VBOXWEBSRV_TRG}"
+    ${CP} "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/"
+    /usr/sbin/chown "${USER}" "${VBOXWEBSRV_TRG}/org.virtualbox.vboxwebsrv.plist"
 fi
 
@@ -77 +77 @@
 DATAPATH="`/usr/bin/dirname "${0}"`/../../../../../.."
 if [ -d "${DATAPATH}/.custom" ]; then
-   echo  1>&2 "Copy ${DATAPATH}/.custom to ${VBOX_INSTALL_PATH}...";
-   ${CPDIR} "${DATAPATH}/.custom/"   "${VBOX_INSTALL_PATH}/custom"
+    echo  1>&2 "Copy ${DATAPATH}/.custom to ${VBOX_INSTALL_PATH}...";
+    ${CPDIR} "${DATAPATH}/.custom/"   "${VBOX_INSTALL_PATH}/custom"
+fi
+
+#
+# Register our file extensions
+#
+LSREGISTER=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister
+if [ -e ${LSREGISTER} ]; then
+    echo "Register file extensions for $USER"
+    /usr/bin/sudo -u "${USER}" ${LSREGISTER} -f /Applications/VirtualBox.app
+    /usr/bin/sudo -u "${USER}" ${LSREGISTER} -f /Applications/VirtualBox.app/Contents/Resources/vmstarter.app
 fi