Changeset 20585 in vbox

Timestamp:

Jun 15, 2009 10:13:55 AM (16 years ago)

Author:

vboxsync

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

48597

Message:

Solaris/Installer: VBoxTestOGL and checkinstall.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (4 diffs)
• checkinstall.sh (added)
• makepackage.sh (modified) (2 diffs)

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

@@ -125 +125 @@
 OTHER_CLEAN      += $(addprefix $(SOLARIS_BASEINST_DIR)/,\
         vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \
-        makepackage.sh prototype postinstall.sh preremove.sh)
+        makepackage.sh prototype postinstall.sh checkinstall.sh preremove.sh)
 
 #
@@ -173 +173 @@
         VBoxNetDHCP \
         VBoxSVC \
+        $(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
         VBoxXPCOMIPCD \
         kchmviewer
@@ -452 +453 @@
                 $(VBOX_PATH_SOL_INST_SRC)/makepackage.sh \
                 $(VBOX_PATH_SOL_INST_SRC)/postinstall.sh \
+                $(VBOX_PATH_SOL_INST_SRC)/checkinstall.sh \
                 $(VBOX_PATH_SOL_INST_SRC)/preremove.sh \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
@@ -547 +549 @@
         $(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
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/checkinstall.sh                                    $(SOLARIS_BASEINST_DIR)/checkinstall.sh
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/preremove.sh                                       $(SOLARIS_BASEINST_DIR)/preremove.sh
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/makepackage.sh                                     $(SOLARIS_BASEINST_DIR)/makepackage.sh

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

@@ -99 +99 @@
 cd "$PKG_BASE_DIR"
 echo 'i pkginfo=./vbox.pkginfo' > prototype
+echo 'i checkinstall=./checkinstall.sh' >> prototype
 echo 'i postinstall=./postinstall.sh' >> prototype
 echo 'i preremove=./preremove.sh' >> prototype
@@ -113 +114 @@
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/webtest
 ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxZoneAccess
+if test -f $VBOX_INSTALLED_DIR/amd64/VBoxTestOGL || test -f $VBOX_INSTALLED_DIR/i386/VBoxTestOGL; then
+    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxTestOGL
+fi
+
 if test -f $VBOX_INSTALLED_DIR/amd64/VirtualBox || test -f $VBOX_INSTALLED_DIR/i386/VirtualBox; then
     ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VirtualBox