Changeset 26538 in vbox for trunk/src/VBox

Timestamp:

Feb 15, 2010 1:34:41 PM (15 years ago)

Author:

vboxsync

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

57713

Message:

Solaris Installer: Use VBOX_VENDOR, VBOX_PRODUCT.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (4 diffs)
• vbi/vboxkern.pkginfo (modified) (2 diffs)
• vbox.pkginfo (modified) (2 diffs)
• virtualbox.desktop (modified) (1 diff)

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

@@ -516 +516 @@
         $(call MSG_L1,Installing files $(SOLARIS_VBOXINST_DIR))
         $(QUIET)$(SED) \
+                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+                -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
                 -e "s/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g" \
@@ -577 +579 @@
         $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp                                    $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh
         $(QUIET)$(RM) -f $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp
-        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop         $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop,)
+        $(QUIET)$(SED) \
+                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+                --output $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop \
+                $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop
         $(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
@@ -589 +594 @@
         $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.depend               $(SOLARIS_BASEINST_DIR)/vbox.depend,)
         $(QUIET)$(SED) \
+                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
+                -e "s/@VBOX_VENDOR@/$(VBOX_VENDOR)/g" \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
                 -e "s/@BUILD_TARGET_ARCH@/$(KBUILD_TARGET_ARCH)/g" \
@@ -722 +729 @@
         $(call MSG_L1,Installing other files $(SOLARIS_VBI_DIR))
         $(QUIET)$(SED) \
+                -e "s/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g" \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
                 -e "s/@VBOX_VERSION_REVSTAMP@/$(PKGINFO_REVSTAMP)/g" \

trunk/src/VBox/Installer/solaris/vbi/vboxkern.pkginfo

@@ -1 +1 @@
 PKG="SUNWvboxkern"
-NAME="Sun VirtualBox Kernel Interface Module"
-SUNW_PRODNAME="Sun VirtualBox Kernel Interface Module"
+NAME="@VBOX_PRODUCT@ Kernel Interface Module"
+SUNW_PRODNAME="@VBOX_PRODUCT@ Kernel Interface Module"
 ARCH="@UNAME_P@"
 VERSION="@VBOX_VERSION_STRING@,REV=@VBOX_VERSION_REVSTAMP@"
@@ -7 +7 @@
 SUNW_PKGVERS=1.0
 CATEGORY="system"
-VENDOR="Sun Microsystems, Inc."
+VENDOR="@VBOX_VENDOR@"
 EMAIL="[email protected]"
 HOTLINE="Please contact your local service provider"

trunk/src/VBox/Installer/solaris/vbox.pkginfo

@@ -1 +1 @@
 PKG="SUNWvbox"
-NAME="Sun VirtualBox"
-SUNW_PRODNAME="Sun VirtualBox"
+NAME="@VBOX_PRODUCT@"
+SUNW_PRODNAME="@VBOX_PRODUCT@"
 ARCH="@UNAME_P@"
 VERSION="@VBOX_VERSION_STRING@,REV=@VBOX_VERSION_REVSTAMP@.@VBOX_SVN_REV@"
@@ -7 +7 @@
 SUNW_PKGVERS=1.0
 CATEGORY="application"
-VENDOR="Sun Microsystems, Inc."
+VENDOR="@VBOX_VENDOR@"
 HOTLINE="Please contact your local service provider"
 BASEDIR="/"

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

@@ -2 +2 @@
 Encoding=UTF-8
 Version=1.0
-Name=Sun VirtualBox
+Name=@VBOX_PRODUCT@
 GenericName=Virtual Machine
 Type=Application