Changeset 35000 in vbox

Timestamp:

Dec 13, 2010 1:00:33 PM (14 years ago)

Author:

vboxsync

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

68823

Message:

Installer/linux: move virtualbox.xml and virtualbox.desktop to the common installer bits as they're needed for Solaris etc. as well.

Location:

trunk/src/VBox/Installer

Files:

• common/virtualbox.desktop.in (moved) (moved from trunk/src/VBox/Installer/linux/virtualbox.desktop ) (2 diffs)
• common/virtualbox.xml (moved) (moved from trunk/src/VBox/Installer/linux/virtualbox.xml )
• linux/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Installer/common/virtualbox.desktop.in

@@ -2 +2 @@
 Encoding=UTF-8
 Version=1.0
-Name=Oracle VM VirtualBox
+Name=@VBOX_PRODUCT@
 GenericName=Virtual Machine
 Type=Application
@@ -8 +8 @@
 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
+DocPath=file://@VBOX_DOC_PATH@/UserManual.pdf
 Icon=VBox
 Categories=Emulator;System;X-MandrivaLinux-System;
 Comment=Run several virtual systems on a single host computer
-Comment[de]=Windows und andere Betriebssysteme unter Linux ausführen
+Comment[de]=Mehrere virtuelle Maschinen auf einem einzigen Rechner ausführen
 Comment[it]=Esegui più macchine virtuali su un singolo computer
 Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza

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 \
+        $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/virtualbox.desktop,)
 linux-misc_CLEAN = $(PATH_linux-misc)/virtualbox.desktop
 
-$$(PATH_linux-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
+$$(PATH_linux-misc)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
 ifdef VBOX_PATH_PACKAGE_DOCS
-        $(QUIET)$(SED) -e "s+\$$VBOX_DOC_PATH+$(VBOX_PATH_PACKAGE_DOCS)+" --output $@ $<
+        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_PATH_PACKAGE_DOCS)+" \
+                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+                --output $@ $<
 else
-        $(QUIET)$(SED) -e "s+\$$VBOX_DOC_PATH+/opt/VirtualBox+" --output $@ $<
+        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
+                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+                --output $@ $<
 endif