Changeset 31940 in vbox for trunk/src

Timestamp:

Aug 24, 2010 8:05:59 PM (14 years ago)

Author:

vboxsync

Message:

Installer-OSX: install launchd description file for vboxwebsrv

Location:

trunk/src/VBox/Installer/darwin

Files:

• DiskImage/VirtualBox_Uninstall.tool (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• VirtualBox/org.virtualbox.vboxwebsrv.plist (added)
• VirtualBox/postflight (modified) (2 diffs)

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

@@ -48 +48 @@
 my_directories=""
 my_files=""
+
+# Users files first
+test -f "${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist"  && my_files="$my_files ${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist"
 
 test -d /Library/StartupItems/VirtualBox/          && my_directories="$my_directories /Library/StartupItems/VirtualBox/"

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

@@ -741 +741 @@
                 $(if-expr defined(VBOX_WITH_PYTHON), $(addprefix $(VBOX_PATH_DIST)/, $(VBOX_DI_VBAPP_PYTHON_FILES)),) \
                 $(if-expr defined(VBOX_WITH_JXPCOM), $(addprefix $(VBOX_PATH_DIST)/, sdk/bindings/xpcom/java/vboxjxpcom.jar),) \
+                $(if $(VBOX_WITH_WEBSERVICES),$(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist,) \
                 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
         $(call MSG_TOOL,PackageMaker,,,$@)
@@ -790 +791 @@
         $(foreach f, $(VBOX_INSTALL_LANG_FILES) \
                 ,$(INSTALL) -m 0644 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/nls/$(f)    $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/nls/$(f)$(NLTAB))
+ifdef VBOX_WITH_WEBSERVICES
+        $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/org.virtualbox.vboxwebsrv.plist   $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/
+endif
         @# Install the python stuff
 ifdef VBOX_WITH_PYTHON

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

@@ -12 +12 @@
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 #
+
+CP="/bin/cp -f"
+CPDIR="${CP} -R"
 
 #
@@ -59 +62 @@
 
 #
+# Install the vboxweb service file for launchd
+#
+VBOXWEBSRV="${VBOX_INSTALL_PATH}/org.virtualbox.vboxwebsrv.plist"
+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"
+fi
+
+#
 # Install any custom files
 #
-CP="/bin/cp -f"
-CPDIR="${CP} -R"
 DATAPATH="`/usr/bin/dirname "${0}"`/../../../../../.."
 if [ -d "${DATAPATH}/.custom" ]; then