Changeset 21600 in vbox for trunk/src/VBox/Installer

Timestamp:

Jul 15, 2009 11:10:10 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: install bindings for all supported python versions.

Location:

trunk/src/VBox/Installer/solaris

Files:

• ipsinstall.sh (modified) (2 diffs)
• postinstall.sh (modified) (2 diffs)

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

@@ -49 +49 @@
         exit 3
     fi
+}
+
+install_python_bindings()
+{
+    PYTHONBIN=$1
+    if test -x "$PYTHONBIN"; then
+        VBOX_INSTALL_PATH=/opt/VirtualBox
+        export VBOX_INSTALL_PATH
+        cd /opt/VirtualBox/sdk/installer
+        $PYTHONBIN ./vboxapisetup.py install > /dev/null
+        return 0
+    fi
+    return 1
 }
 
@@ -168 +181 @@
     PYTHONBIN=`which python`
     if test -f "$PYTHONBIN" || test -h "$PYTHONBIN"; then
-        echo "Installing python bindings..."
-
-        VBOX_INSTALL_PATH=/opt/VirtualBox
-        export VBOX_INSTALL_PATH
-        cd /opt/VirtualBox/sdk/installer
-        $PYTHONBIN ./vboxapisetup.py install > /dev/null
-        rc3=$?
-        echo "Done."
+        echo "Installing Python bindings..."
+
+        INSTALLEDIT=1
+        PYTHONBIN=`which python2.4`
+        install_python_bindings "$PYTHONBIN"
+        if test "$?" -eq 0; then
+            INSTALLEDIT=0
+        fi
+        PYTHONBIN=`which python2.5`
+        install_python_bindings "$PYTHONBIN"
+        if test "$?" -eq 0; then
+            INSTALLEDIT=0
+        fi
+        PYTHONBIN=`which python2.6`
+        install_python_bindings "$PYTHONBIN"
+        if test "$?" -eq 0; then 
+            INSTALLEDIT=0
+        fi
+
+        # remove files installed by Python build
+        rm -rf /opt/VirtualBox/sdk/installer/build
+
+        if test "$INSTALLEDIT" -ne 0; then
+            echo "** No suitable Python version found. Requires Python 2.4, 2.5 or 2.6."
+        fi
+        rc3=$INSTALLEDIT
     else
         echo "** WARNING! Python not found, skipped installed Python bindings."

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

@@ -20 +20 @@
 # additional information or have any questions.
 #
+
+install_python_bindings()
+{
+    PYTHONBIN=$1
+    if test -x "$PYTHONBIN"; then
+        VBOX_INSTALL_PATH=/opt/VirtualBox
+        export VBOX_INSTALL_PATH
+        cd /opt/VirtualBox/sdk/installer
+        $PYTHONBIN ./vboxapisetup.py install > /dev/null
+        return 0
+    fi
+    return 1
+}
 
 # Check for xVM/Xen
@@ -122 +135 @@
             echo "Installing Python bindings..."
 
-            VBOX_INSTALL_PATH=/opt/VirtualBox
-            export VBOX_INSTALL_PATH
-            cd /opt/VirtualBox/sdk/installer
-            $PYTHONBIN ./vboxapisetup.py install > /dev/null
+            INSTALLEDIT=1
+            PYTHONBIN=`which python2.4`
+            install_python_bindings "$PYTHONBIN"
+            if test "$?" -eq 0; then
+                INSTALLEDIT=0
+            fi
+            PYTHONBIN=`which python2.5`
+            install_python_bindings "$PYTHONBIN"
+            if test "$?" -eq 0; then
+                INSTALLEDIT=0
+            fi
+            PYTHONBIN=`which python2.6`
+            install_python_bindings "$PYTHONBIN"
+            if test "$?" -eq 0; then 
+                INSTALLEDIT=0
+            fi
 
             # remove files installed by Python build
-            rm -rf $VBOX_INSTALL_PATH/sdk/installer/build
+            rm -rf /opt/VirtualBox/sdk/installer/build
+
+            if test "$INSTALLEDIT" -ne 0; then
+                echo "** No suitable Python version found. Requires Python 2.4, 2.5 or 2.6."
+            fi
         else
             echo "** WARNING! Python not found, skipped installed Python bindings."