Changeset 92629 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Nov 29, 2021 3:59:38 PM (3 years ago)

Author:

vboxsync

Message:

Installer/solaris: Install VirtualBox API bindings for every suitable Python version in the list of "usual suspects". bugref:9840

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (5 diffs)

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

@@ -27 +27 @@
 export LANG
 
-DIR_VBOXBASE="$PKG_INSTALL_ROOT/opt/VirtualBox"
+VBOX_INSTALL_PATH="$PKG_INSTALL_ROOT/opt/VirtualBox"
+CONFIG_DIR=/etc/vbox
+CONFIG_FILES=filelist
 DIR_CONF="$PKG_INSTALL_ROOT/platform/i86pc/kernel/drv"
 DIR_MOD_32="$PKG_INSTALL_ROOT/platform/i86pc/kernel/drv"
@@ -891 +893 @@
 }
 
-# install_python_bindings(pythonbin)
-# remarks: changes pwd
+# install_python_bindings(pythonbin pythondesc)
 # failure: non fatal
 install_python_bindings()
 {
+    pythonbin="$1"
+    pythondesc="$2"
+
     # The python binary might not be there, so just exit silently
-    if test -z "$1"; then
+    if test -z "$pythonbin"; then
         return 0
     fi
 
-    if test -z "$2"; then
+    if test -z "$pythondesc"; then
         errorprint "missing argument to install_python_bindings"
-        exit 1
-    fi
-
-    pythonbin=$1
-    pythondesc=$2
-    if test -x "$pythonbin"; then
-        # check if python has working distutils
-        $pythonbin -c "from distutils.core import setup" > /dev/null 2>&1
-        if test "$?" -ne 0; then
-            subprint "Skipped: $pythondesc install is unusable"
-            return 0
-        fi
-
-        VBOX_INSTALL_PATH="$DIR_VBOXBASE"
-        export VBOX_INSTALL_PATH
-        cd $DIR_VBOXBASE/sdk/installer
-        $pythonbin ./vboxapisetup.py install > /dev/null
-        if test "$?" -eq 0; then
-            subprint "Installed: Bindings for $pythondesc"
-        fi
+        return 1
+    fi
+
+    infoprint "Python found: $pythonbin, installing bindings..."
+
+    # check if python has working distutils
+    "$pythonbin" -c "from distutils.core import setup" > /dev/null 2>&1
+    if test "$?" -ne 0; then
+        subprint "Skipped: $pythondesc install is unusable"
         return 0
     fi
-    return 1
+
+    # Pass install path via environment
+    export VBOX_INSTALL_PATH
+    rm "$CONFIG_DIR/python-$CONFIG_FILES"
+    $SHELL -c "cd \"$VBOX_INSTALL_PATH\"/sdk/installer && \"$pythonbin\" ./vboxapisetup.py install \
+        --record \"$CONFIG_DIR/python-$CONFIG_FILES\""
+    if test "$?" -eq 0; then
+        cat "$CONFIG_DIR/python-$CONFIG_FILES" >> "$CONFIG_DIR/$CONFIG_FILES"
+    else
+        errorprint "Failed to install bindings for $pythondesc"
+    fi
+    rm "$CONFIG_DIR/python-$CONFIG_FILES"
+
+    # Remove files created by Python API setup.
+    rm -rf $VBOX_INSTALL_PATH/sdk/installer/build
+    return 0
 }
 
@@ -1245 +1253 @@
         fi
     fi
+
+    # Remove stuff installed for the Python bindings.
+    if [ -r "$CONFIG_DIR/$CONFIG_FILES" ]; then
+        rm -f `cat "$CONFIG_DIR/$CONFIG_FILES"` 2> /dev/null
+        rm -f "$CONFIG_DIR/$CONFIG_FILES" 2> /dev/null
+        rmdir "$CONFIG_DIR" 2> /dev/null
+    fi
 }
 
@@ -1301 +1316 @@
             infoprint "Configuring services..."
             if test "$REMOTEINST" -eq 1; then
-                subprint "Skipped for targetted installs."
+                subprint "Skipped for targeted installs."
             else
                 # Since S11 the way to import a manifest is via restarting manifest-import which is asynchronous and can
@@ -1323 +1338 @@
                 /usr/bin/update-desktop-database -q 2>/dev/null
             else
-                subprint "Skipped for targetted installs."
-            fi
-        fi
-
-        # Install python bindings for non-remote installs
-        if test "$REMOTEINST" -eq 0; then
-            if test -f "$DIR_VBOXBASE/sdk/installer/vboxapisetup.py" || test -h "$DIR_VBOXBASE/sdk/installer/vboxapisetup.py"; then
-                PYTHONBIN=`which python 2> /dev/null`
-                if test -f "$PYTHONBIN" || test -h "$PYTHONBIN"; then
-                    infoprint "Installing Python bindings..."
-
-                    INSTALLEDIT=1
-                    PYTHONBIN=`which python2.4 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN" "Python 2.4"
-                    if test "$?" -eq 0; then
-                        INSTALLEDIT=0
+                subprint "Skipped for targeted installs."
+            fi
+        fi
+
+        if test -f "$VBOX_INSTALL_PATH/sdk/installer/vboxapisetup.py" || test -h "$VBOX_INSTALL_PATH/sdk/installer/vboxapisetup.py"; then
+            # Install python bindings for non-remote installs
+            if test "$REMOTEINST" -eq 0; then
+                infoprint "Installing Python bindings..."
+
+                # Loop over all usual suspect Python executable names and try
+                # installing the VirtualBox API bindings. Needs to prevent
+                # double installs which waste quite a bit of time.
+                PYTHONS=""
+                for p in python2.4 python2.5 python2.6 python2.7 python2 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3 python; do
+                    if [ "`$p -c 'import sys
+if sys.version_info >= (2, 4) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)):
+    print(\"test\")' 2> /dev/null`" != "test" ]; then
+                        continue
                     fi
-                    PYTHONBIN=`which python2.5 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN" "Python 2.5"
-                    if test "$?" -eq 0; then
-                        INSTALLEDIT=0
+                    # Get python major/minor version, and skip if it was
+                    # already covered.  Uses grep -F to avoid trouble with '.'
+                    # matching any char.
+                    pyvers="`$p -c 'import sys
+print("%s.%s" % (sys.version_info[0], sys.version_info[1]))' 2> /dev/null`"
+                    if echo "$PYTHONS" | /usr/xpg4/bin/grep -Fq ":$pyvers:"; then
+                        continue
                     fi
-                    PYTHONBIN=`which python2.6 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN" "Python 2.6"
-                    if test "$?" -eq 0; then
-                        INSTALLEDIT=0
-                    fi
-                    PYTHONBIN=`which python2.7 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN" "Python 2.7"
-                    if test "$?" -eq 0; then
-                        INSTALLEDIT=0
-                    fi
-                    PYTHONBIN=`which python3 2>/dev/null`
-                    install_python_bindings "$PYTHONBIN" "Python 3.x"
-                    if test "$?" -eq 0; then
-                        INSTALLEDIT=0
-                    fi
-
-                    # remove files installed by Python build
-                    rm -rf $DIR_VBOXBASE/sdk/installer/build
-
-                    if test "$INSTALLEDIT" -ne 0; then
-                        warnprint "No suitable Python version found. Required Python 2.4, 2.5, 2.6, 2.7 or 3.x"
-                        warnprint "Skipped installing the Python bindings."
-                    fi
-                else
-                    warnprint "Python not found, skipped installed Python bindings."
+                    # Record which version will be installed. If it fails there
+                    # is no point trying with different executable/symlink
+                    # reporting the same version.
+                    PYTHONS="$PYTHONS:$pyvers:"
+                    install_python_bindings "$p" "Python $pyvers"
+                done
+                if [ -z "$PYTHONS" ]; then
+                    warnprint "Python (2.4 to 2.7 or 3.3 and later) unavailable, skipping bindings installation."
                 fi
-            fi
-        else
-            warnprint "Skipped installing Python bindings. Run, as root, 'vboxapisetup.py install' manually from the booted system."
+            else
+                warnprint "Skipped installing Python bindings. Run, as root, 'vboxapisetup.py install' manually from the booted system."
+            fi
         fi