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

Timestamp:

Nov 12, 2015 9:08:04 AM (9 years ago)

Author:

vboxsync

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

104090

Message:

Solaris/Installer: Add support for Python 2.7 bindings, adjusted makefile to do wildcard matching while creating the package.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (1 diff)
• checkinstall.sh (modified) (1 diff)
• vboxconfig.sh (modified) (2 diffs)

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

@@ -450 +450 @@
         $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+  SOLARIS_PYTHON_32_ON_64_BINS = $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*_x86.so))
   ifdef VBOX_WITH_32_ON_64_MAIN_API
-   SOLARIS_COMMON_STRIP_BINS   += VBoxPython2_6_x86.so
+   SOLARIS_COMMON_STRIP_BINS   += $(SOLARIS_PYTHON_32_ON_64_BINS)
   endif
-  SOLARIS_COMMON_64_STRIP_BINS += VBoxPython.so VBoxPython2_6.so
+  SOLARIS_COMMON_64_STRIP_BINS += $(filter-out $(SOLARIS_PYTHON_32_ON_64_BINS), $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)))
  else
-  SOLARIS_COMMON_STRIP_BINS    += VBoxPython.so VBoxPython2_6.so
+  SOLARIS_COMMON_STRIP_BINS    += $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)))
  endif
 endif

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

@@ -134 +134 @@
 
 if test -x "$BIN_PKG"; then
-    checkdep_ips "runtime/python-26"
+    checkdep_ips_either "runtime/python-26" "runtime/python-27"
     checkdep_ips_either "system/library/iconv/utf-8" "system/library/iconv/iconv-core"
 else

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

@@ -1274 +1274 @@
                         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
 
                     # remove files installed by Python build
@@ -1279 +1284 @@
 
                     if test "$INSTALLEDIT" -ne 0; then
-                        warnprint "No suitable Python version found. Required Python 2.4, 2.5 or 2.6."
+                        warnprint "No suitable Python version found. Required Python 2.4, 2.5, 2.6 or 2.7"
                         warnprint "Skipped installing the Python bindings."
                     fi