Changeset 11905 in vbox

Timestamp:

Sep 1, 2008 9:45:45 AM (16 years ago)

Author:

vboxsync

Message:

VBoxPython: Install as VBoxPython2_3 on darwin (since that's what we're building now).

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• python/vboxxpcom.py (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1326 +1326 @@
 VBoxPython_DEFS = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTI_API EXPORT_XPT_API \
                   VBOX_PYXPCOM VBOX_WITH_XPCOM
+VBoxPython_NAME.darwin = VBoxPython2_3
 VBoxPython_INCS = \
         python/src \

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

@@ -25 +25 @@
 #cglue = __import__('VBoxPython')
 if platform.system() == 'Darwin':
-    # TODO: This needs to be changed if it is supposed to work with OSE as well.
+    # 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.
     saved_sys_path = sys.path;
     sys.path = [ '/Applications/VirtualBox.app/Contents/MacOS', ] + saved_sys_path
-    cglue = __import__('VBoxPython')
+    mod = 'VBoxPython' + str(sys.version_info[0]) + '_' + str(sys.version_info[1])
+    cglue = __import__(mod)
     sys.path = saved_sys_path    
 else:
@@ -34 +42 @@
 sys.modules['xpcom._xpcom'] = cglue
 xpcom._xpcom = cglue
+