Changeset 35022 in vbox

Timestamp:

Dec 13, 2010 3:23:34 PM (14 years ago)

Author:

vboxsync

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

68850

Message:

Installer/solaris: use common virtualbox.desktop/xml and 1st attempt to handle MIME type icons

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (9 diffs)
• vboxconfig.sh (modified) (1 diff)
• virtualbox.desktop (deleted)

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

@@ -47 +47 @@
 SOLARIS_USRBIN_DIR         := $(SOLARIS_USR_DIR)/bin
 SOLARIS_USRSHR_APPS_DIR    := $(SOLARIS_USR_DIR)/share/applications
+SOLARIS_USRSHR_MIMEXML_DIR := $(SOLARIS_USR_DIR)/share/mime/application
+SOLARIS_USRSHR_ICONS_DIR   := $(SOLARIS_USR_DIR)/share/icons/hicolor
 SOLARIS_USRSHR_PIXMAPS_DIR := $(SOLARIS_USR_DIR)/share/pixmaps
 SOLARIS_VBOXSMF_DIR        := $(SOLARIS_BASEINST_DIR)/var/svc/manifest/application/virtualbox
@@ -98 +100 @@
 #
 PROGRAMS         += VBoxZoneAccess VBoxISAExec
-INSTALLS         += solaris-doc solaris-bin solaris-drv-confs
+INSTALLS         += solaris-doc solaris-bin solaris-drv-confs solaris-icons
 
 BLDDIRS          += \
@@ -164 +166 @@
         $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf) \
         $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf)
+
+solaris-icons_INST = bin/icons
+solaris-icons_MODE = a+r,u+w
+solaris-icons_SOURCES = $(VBOX_MIME_ICONS)
+
+VBOX_MIME_ICONS = \
+        $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
+            $(foreach f,ova ovf vbox vbox-extpack, \
+                $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+                    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
+
+SOLARIS_COMMON_ICONS = \
+        $(foreach f,ova ovf vbox vbox-extpack, \
+            $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+                $(s)x$(s)/virtualbox-$(f).png))
+
 
 #
@@ -284 +302 @@
         $(if $(not $(VBOX_WITH_NETFLT))vnic_term.sh,) \
         $(if $(VBOX_WITH_QTGUI),virtualbox.desktop,) \
+        virtualbox.xml \
         virtualbox-webservice.xml \
         virtualbox-zoneaccess.xml \
@@ -439 +458 @@
         $(addprefix $(SOLARIS_DRIVERINST_DIR)/,$(SOLARIS_DRIVER_CONFS)) \
         $(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON_EXES)) \
-        $(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS))
+        $(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)) \
+        $(addprefix $(SOLARIS_USRSHR_ICONS_DIR)/,$(SOLARIS_COMMON_ICONS))
 
 BLDDIRS += $(foreach d,\
@@ -511 +531 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.depend \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse \
-                $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop \
+                $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in \
+                $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
                 $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
                 $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
@@ -545 +566 @@
         $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXSMF_DIR)
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(MKDIR) -p $(SOLARIS_USRSHR_APPS_DIR),)
+        $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_MIMEXML_DIR)
+        $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_ICONS_DIR)
         $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR)
         $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0    $(SOLARIS_ETC_DIR)/hostname.vboxnet0,)
@@ -603 +626 @@
         $(QUIET)$(RM) -f $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp
         $(QUIET)$(SED) \
-                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+                -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
                 --output $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop \
-                $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop
+                $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in
+        $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml                        $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/postinstall.sh                                     $(SOLARIS_BASEINST_DIR)/postinstall.sh
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/VBox.png                                                  $(SOLARIS_USRSHR_PIXMAPS_DIR)/VBox.png
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/postinstall.sh                                     $(SOLARIS_BASEINST_DIR)/postinstall.sh
@@ -722 +748 @@
         $(INSTALL) -m 0755 $< $@
 
+# Common MIME icons
+$(addprefix $(SOLARIS_USRSHR_ICONS_DIR)/,$(SOLARIS_COMMON_ICONS)): \
+                $(SOLARIS_USRSHR_ICONS_DIR)/% : $(PATH_BIN)/icons/% | $$(dir $$@)
+        $(INSTALL) -m 0644 $< $@
+
 
 

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -792 +792 @@
             infoprint "Configuring services..."
             if test "$REMOTEINST" -eq 1; then
+                subprint "Skipped for targetted installs."
+            fi
+        fi
+
+        if test -d $PKG_INSTALL_ROOT/usr/share/icons; then
+            infoprint "Installing MIME types and icons"
+            if test "$REMOTEINST" -eq 0; then
+                update-mime-database -q 2>/dev/null
+                update-desktop-database -q 2>/dev/null
+            else
                 subprint "Skipped for targetted installs."
             fi