Changeset 34522 in vbox

Timestamp:

Nov 30, 2010 2:49:21 PM (14 years ago)

Author:

vboxsync

Message:

Linux installer: added mime type handling for the generic .run packages

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (4 diffs)
• install.sh (modified) (2 diffs)
• uninstall.sh (modified) (2 diffs)
• virtualbox.desktop (modified) (1 diff)
• virtualbox.xml (added)

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

@@ -75 +75 @@
 linux-misc_SOURCES = \
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
+        $(PATH_ROOT)/src/VBox/Installer/linux/virtualbox.xml \
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/virtualbox.desktop,)
@@ -87 +88 @@
 endif
 
+INSTALLS += linux-icons
+linux-icons_INST = bin/icons
+linux-icons_MODE = a+r,u+w
+linux-icons_SOURCES = $(VBOX_MIME_ICONS)
 
 
@@ -160 +165 @@
  VBOX_LNX_NO_STRIP += \
         virtualbox.desktop \
+        virtualbox.xml \
         $(VBOX_LICENSE_FILES) \
         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/lib*VBox*)),) \
         $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
-        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
+        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
+        icons
 endif
 
@@ -254 +261 @@
         VBoxEFI64.fd
 endif
+
+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)))
 
 #

trunk/src/VBox/Installer/linux/install.sh

@@ -386 +386 @@
     ln -sf $INSTALLATION_DIR/VBox.png /usr/share/pixmaps/VBox.png
     ln -sf $INSTALLATION_DIR/virtualbox.desktop /usr/share/applications/virtualbox.desktop
+    ln -sf $INSTALLATION_DIR/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
     ln -sf $INSTALLATION_DIR/rdesktop-vrdp /usr/bin/rdesktop-vrdp
     ln -sf $INSTALLATION_DIR/src/vboxhost /usr/src/vboxhost-_VERSION_
@@ -394 +395 @@
     ln -sf VBoxSDL /usr/bin/vboxsdl > /dev/null 2>&1
     ln -sf VBoxHeadless /usr/bin/vboxheadless > /dev/null 2>&1
+
+    # Icons
+    cur=`pwd`
+    cd $INSTALLATION_DIR/icons
+    for i in *; do
+        cd $i
+        if [ -d /usr/share/icons/hicolor/$i ]; then
+            for j in *; do
+                if [ -d /usr/share/icons/hicolor/$i/mimetypes ]; then
+                    ln -s $INSTALLATION_DIR/icons/$i/$j /usr/share/icons/hicolor/$i/mimetypes/$j
+                    echo /usr/share/icons/hicolor/$i/mimetypes/$j >> $CONFIG_DIR/$CONFIG_FILES
+                fi
+            done
+        fi
+        cd -
+    done
+    cd $cur
+
+    # Update the MIME database
+    update-mime-database /usr/share/mime 2>/dev/null
 
     # If Python is available, install Python bindings

trunk/src/VBox/Installer/linux/uninstall.sh

@@ -96 +96 @@
   /usr/share/pixmaps/VBox.png \
   /usr/share/applications/virtualbox.desktop \
+  /usr/share/mime/packages/virtualbox.xml \
   /usr/bin/rdesktop-vrdp \
   /usr/bin/virtualbox \
@@ -158 +159 @@
     log "Successfully $INSTALL_VER$INSTALL_REV removed VirtualBox."
 fi
+update-mime-database /usr/share/mime >/dev/null 2>&1

trunk/src/VBox/Installer/linux/virtualbox.desktop

@@ -5 +5 @@
 GenericName=Virtual Machine
 Type=Application
-Exec=VirtualBox
+Exec=VirtualBox "%U"
 TryExec=VirtualBox
+MimeType=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova
 DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
 Icon=VBox