Changeset 20971 in vbox

Timestamp:

Jun 26, 2009 1:43:58 PM (16 years ago)

Author:

vboxsync

Message:

Python: Darwin multibin build

Location:

trunk/src/libs/xpcom18a4/python

Files:

• Makefile.kmk (modified) (3 diffs)
• gen_python_deps.py (modified) (2 diffs)

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

@@ -61 +61 @@
         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
 
+ifeq ($(KBUILD_TARGET),darwin)
+ ## @todo kBuild - this ain't working: VBoxPython_DLLSUFF.darwin = .so
+ VBoxPythonBase_DLLSUFF = .so
+endif
+
 # Python 2.3 version
 VBoxPython23_EXTENDS    = VBoxPythonBase
@@ -82 +87 @@
 
 VBoxPython24_DEFS       = VBOX_PYXPCOM_VERSIONED
-VBoxPython24_INCS       =  $(VBOX_PYTHON24_INC)
-VBoxPython24_LIBS       =  $(VBOX_PYTHON24_LIB)
+VBoxPython24_INCS       = $(VBOX_PYTHON24_INC)
+VBoxPython24_LIBS       = $(VBOX_PYTHON24_LIB)
 
 ifdef VBOX_PYTHON24_INC
@@ -93 +98 @@
 VBoxPython25_EXTENDS_BY = appending
 VBoxPython25_NAME       = VBoxPython2_5
-VBoxPython25_TEMPLATE   = XPCOM
+if "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
+ VBoxPython25_TEMPLATE   = XPCOMOSX105
+else
+ VBoxPython25_TEMPLATE   = XPCOM
+endif
+VBoxPython25_LDFLAGS.darwin   = -install_name /Users/vbox/nike/ws/out/darwin.x86/debug/dist/VirtualBox.app/Contents/MacOS/VBoxPython2_5.so
+#VBoxPython25_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxPython2_5.so
 
 VBoxPython25_DEFS       = VBOX_PYXPCOM_VERSIONED

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

@@ -20 +20 @@
 
 versions = ["2.3", "2.4", "2.5", "2.6", "2.7", "2.8"]
-prefixes = ["/usr", "/usr/local", "/opt"]
+prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
 known = {}
 
-def checkPair(p,v):
+def checkPair(p,v,dllpre,dllsuff):
     file =  os.path.join(p, "include", "python"+v, "Python.h")
     # or just stat()?
@@ -29 +29 @@
         return None
     return [os.path.join(p, "include", "python"+v), 
-            os.path.join(p, "lib", "libpython"+v+".so")]
+            os.path.join(p, "lib", dllpre+"python"+v+dllsuff)]
 
 def main(argv):
+    dllpre = "lib"
+    dllsuff = ".so"
+    if sys.platform == 'darwin':
+        prefixes.insert(0, '/Developer/SDKs/MacOSX10.4u.sdk/usr')
+        prefixes.insert(0, '/Developer/SDKs/MacOSX10.5.sdk/usr')
+        dllsuff = '.dylib'
+    
     for v in versions:
         for p in prefixes:
-            c = checkPair(p, v)
+            c = checkPair(p, v, dllpre, dllsuff)
             if c is not None:
                 known[v] = c