Changeset 48282 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Sep 4, 2013 11:59:15 PM (12 years ago)

Author:

vboxsync

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

88697

Message:

32-bit main API on 64-bit solaris.

Location:

trunk/src/libs/xpcom18a4/python

Files:

• Makefile.kmk (modified) (11 diffs)
• gen_python_deps.py (modified) (2 diffs)
• src/module/_xpcom.cpp (modified) (2 diffs)
• vboxxpcom.py (modified) (1 diff)

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -27 +27 @@
 #
 # List of supported Python versions, defining a number of
-# VBOX_PYTHON[25|26|27|28|DEF]_[INC|LIB] variables which get picked up below.
+# VBOX_PYTHON[25|26|27|DEF]_[INC|LIB] variables which get picked up below.
 #
 ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
@@ -33 +33 @@
   VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
   VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
+  VBOX_PYTHON25_LIB_X86 = $(VBOX_PYTHON25_LIB)
  endif
  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
@@ -39 +40 @@
   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
+  VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
  endif
  if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
@@ -45 +47 @@
   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
+  VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
  endif
 
@@ -103 +106 @@
         $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
 
+# 32-bit base.
+VBoxPythonBase_x86_TEMPLATE = XPCOM-x86
+VBoxPythonBase_x86_EXTENDS  = VBoxPythonBase
+VBoxPythonBase_x86_DEFS     = MODULE_NAME_SUFFIX=_x86 $(VBoxPythonBase_DEFS)
+VBoxPythonBase_x86_LIBS     = \
+        $(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_BIN)/VBoxXPCOM-x86$(VBOX_SUFF_DLL)
+
 
 ifdef VBOX_PYTHON23_INC
@@ -114 +125 @@
 VBoxPython2_3_INCS       = $(VBOX_PYTHON23_INC)
 VBoxPython2_3_LIBS       = $(VBOX_PYTHON23_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+DLLS += VBoxPython2_3_x86
+VBoxPython2_3_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython2_3_x86_EXTENDS_BY = appending
+VBoxPython2_3_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX104,-x86)
+VBoxPython2_3_x86_INCS       = $(VBOX_PYTHON23_INC)
+VBoxPython2_3_x86_LIBS       = $(VBOX_PYTHON23_LIB_X86)
+ endif
 endif
 
@@ -125 +145 @@
 VBoxPython2_4_INCS       = $(VBOX_PYTHON24_INC)
 VBoxPython2_4_LIBS       = $(VBOX_PYTHON24_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+DLLS += VBoxPython2_4_x86
+VBoxPython2_4_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython2_4_x86_EXTENDS_BY = appending
+VBoxPython2_4_x86_INCS       = $(VBOX_PYTHON24_INC)
+VBoxPython2_4_x86_LIBS       = $(VBOX_PYTHON24_LIB_X86)
+ endif
 endif
 
@@ -134 +162 @@
 VBoxPython2_5_EXTENDS    = VBoxPythonBase
 VBoxPython2_5_EXTENDS_BY = appending
-VBoxPython2_5_TEMPLATE   = XPCOM
 VBoxPython2_5_INCS       = $(VBOX_PYTHON25_INC)
 VBoxPython2_5_LIBS       = $(VBOX_PYTHON25_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+DLLS += VBoxPython2_5_x86
+VBoxPython2_5_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython2_5_x86_EXTENDS_BY = appending
+VBoxPython2_5_x86_INCS       = $(VBOX_PYTHON25_INC)
+VBoxPython2_5_x86_LIBS       = $(VBOX_PYTHON25_LIB_X86)
+ endif
 endif
 
@@ -149 +184 @@
 VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
 VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+DLLS += VBoxPython2_6_x86
+VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython2_6_x86_EXTENDS_BY = appending
+VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX106,-x86)
+VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
+VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
+ endif
 endif
 
@@ -160 +204 @@
 VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,)
 VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
-VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
-endif
-
-ifdef VBOX_PYTHON28_INC
-#
-# Python 2.8 version
-#
-DLLS += VBoxPython2_8
-VBoxPython2_8_EXTENDS    = VBoxPythonBase
-VBoxPython2_8_EXTENDS_BY = appending
-VBoxPython2_8_INCS       = $(VBOX_PYTHON28_INC)
-VBoxPython2_8_LIBS       = $(VBOX_PYTHON28_LIB)
+VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB_X86)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+DLLS += VBoxPython2_7_x86
+VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython2_7_x86_EXTENDS_BY = appending
+VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,-x86)
+VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
+VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
+ endif
 endif
 
@@ -187 +229 @@
  VBoxPython_LIBS        = $(VBoxPythonBase_LIBS) $(VBOX_PYTHONDEF_LIB)
 endif
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+VBoxPython_x86_EXTENDS      = VBoxPythonBase_x86
+VBoxPython_x86_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_x86_DEFS))
+VBoxPython_x86_INCS         = $(VBoxPythonBase_x86_INCS) $(VBOX_PYTHONDEF_INC)
+if "$(KBUILD_TARGET)" == "linux"
+ VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS)
+else
+ VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS) $(VBOX_PYTHONDEF_LIB_X86)
+endif
+ endif
 endif
 

trunk/src/libs/xpcom18a4/python/gen_python_deps.py

@@ -15 +15 @@
 import os,sys
 
-versions = ["2.3", "2.4", "2.5", "2.6", "2.7", "2.8"]
+versions = ["2.3", "2.4", "2.5", "2.6", "2.7",]
 prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
 known = {}
@@ -44 +44 @@
     if bitness_magic > 0:
         print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep)
+        print "VBOX_PYTHON%s_LIB_X86=%s%s" %(vers, known[1], sep)
     else:
         print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[1], sep)

trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

@@ -75 +75 @@
 
 #ifdef VBOX_PYXPCOM
+# include <iprt/cdefs.h>
+# ifndef MODULE_NAME_SUFFIX
+#  define MANGLE_MODULE_NAME(a_szName)  a_szName
+#  define MANGLE_MODULE_INIT(a_Name)    a_Name
+# else
+#  define MANGLE_MODULE_NAME(a_szName)  a_szName RT_XSTR(MODULE_NAME_SUFFIX)
+#  define MANGLE_MODULE_INIT(a_Name)    RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
+# endif
 # ifdef VBOX_PYXPCOM_VERSIONED
 #  if   PY_VERSION_HEX >= 0x02080000
-#   define MODULE_NAME "VBoxPython2_8"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_8")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_8)
+
 #  elif PY_VERSION_HEX >= 0x02070000
-#   define MODULE_NAME "VBoxPython2_7"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_7")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_7)
+
 #  elif PY_VERSION_HEX >= 0x02060000
-#   define MODULE_NAME "VBoxPython2_6"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_6")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_6)
+
 #  elif PY_VERSION_HEX >= 0x02050000
-#   define MODULE_NAME "VBoxPython2_5"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_5")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_5)
+
 #  elif PY_VERSION_HEX >= 0x02040000
-#   define MODULE_NAME "VBoxPython2_4"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_4")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_4)
+
 #  elif PY_VERSION_HEX >= 0x02030000
-#   define MODULE_NAME "VBoxPython2_3"
+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_3")
+#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_3)
 #  else
 #   error "Fix module versioning."
 #  endif
 # else
-#  define MODULE_NAME "VBoxPython"
+#  define MODULE_NAME     MANGLE_MODULE_NAME("VBoxPython")
+#  define initVBoxPython  MANGLE_MODULE_INIT(initVBoxPython)
 # endif
 #else
@@ -777 +797 @@
 extern "C" NS_EXPORT
 void
-# ifdef VBOX_PYXPCOM_VERSIONED
-#  if   PY_VERSION_HEX >= 0x02080000
-initVBoxPython2_8() {
-#  elif PY_VERSION_HEX >= 0x02070000
-initVBoxPython2_7() {
-#  elif PY_VERSION_HEX >= 0x02060000
-initVBoxPython2_6() {
-#  elif PY_VERSION_HEX >= 0x02050000
-initVBoxPython2_5() {
-#  elif PY_VERSION_HEX >= 0x02040000
-initVBoxPython2_4() {
-#  elif PY_VERSION_HEX >= 0x02030000
-initVBoxPython2_3() {
-#  else
-#   error "Fix module versioning."
-#  endif
-# else
-initVBoxPython() {
-# endif
+initVBoxPython() { /* NOTE! This name is redefined at the top of the file! */
   static bool s_vboxInited = false;
   if (!s_vboxInited) {

trunk/src/libs/xpcom18a4/python/vboxxpcom.py

@@ -15 +15 @@
 import platform
 
-# this code overcomes somewhat unlucky feature of Python, where it searches
+#
+# This code overcomes somewhat unlucky feature of Python, where it searches
 # for binaries in the same place as platfom independent modules, while
 # rest of Python bindings expect _xpcom to be inside xpcom module
+#
 
-candidates = ['VBoxPython' + str(sys.version_info[0]) + '_' + str(sys.version_info[1]), 
-              'VBoxPython' + str(sys.version_info[0]), 
-              'VBoxPython']
+_asVBoxPythons = [
+    'VBoxPython' + str(sys.version_info[0]) + '_' + str(sys.version_info[1]),
+    'VBoxPython' + str(sys.version_info[0]),
+    'VBoxPython'
+];
+
+# On platforms where we ship both 32-bit and 64-bit API bindings, we have to
+# look for the right set if we're a 32-bit process.
+if platform.system() in [ 'SunOS', ] and sys.maxsize <= 2**32:
+    _asNew = [ sCandidate + '_x86' for sCandidate in _asVBoxPythons ];
+    _asNew.extend(_asVBoxPythons);
+    _asVBoxPythons = _asNew;
+    del _asNew;
+
+# On Darwin (aka Mac OS X) we know exactly where things are in a normal
+# VirtualBox installation.
+## @todo Edit this at build time to the actual VBox location set in the make files.
+## @todo We know the location for most hardened builds, not just darwin!
 if platform.system() == 'Darwin':
-    # On Darwin (aka Mac OS X) we know exactly where things are in a normal 
-    # VirtualBox installation. Also, there are two versions of python there
-    # (2.3.x and 2.5.x) depending on whether the os is striped or spotty, so
-    # we have to choose the right module to load.
-    # 
-    # XXX: This needs to be adjusted for OSE builds. A more general solution would 
-    #      be to to sed the file during install and inject the VBOX_PATH_APP_PRIVATE_ARCH
-    #      and VBOX_PATH_SHARED_LIBS when these are set.
     sys.path.append('/Applications/VirtualBox.app/Contents/MacOS')
 
-cglue = None
-for m in candidates:
-   try:
-      cglue =  __import__(m)
-      break
-   except:
-      pass
+_oVBoxPythonMod = None
+for m in _asVBoxPythons:
+    try:
+        _oVBoxPythonMod =  __import__(m)
+        break
+    except Exception, x:
+        print 'm=%s x=%s' % (m, x);
+    #except:
+    #    pass
 
 if platform.system() == 'Darwin':
     sys.path.remove('/Applications/VirtualBox.app/Contents/MacOS')
 
-if cglue == None:
-    raise Exception, "Cannot find VBoxPython module"
+if _oVBoxPythonMod == None:
+    raise Exception('Cannot find VBoxPython module (tried: %s)' % (', '.join(_asVBoxPythons),));
 
-sys.modules['xpcom._xpcom'] = cglue
-xpcom._xpcom = cglue
+sys.modules['xpcom._xpcom'] = _oVBoxPythonMod;
+xpcom._xpcom = _oVBoxPythonMod;