Changeset 21195 in vbox for trunk/src/libs

Timestamp:

Jul 3, 2009 12:26:16 PM (16 years ago)

Author:

vboxsync

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

49498

Message:

Python: multiversion for Solaris

Location:

trunk/src/libs/xpcom18a4/python

Files:

• Makefile.kmk (modified) (1 diff)
• gen_python_deps.py (modified) (2 diffs)

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

@@ -24 +24 @@
 
 # list of supported Python versions
-$(eval $(patsubst %|,%$(NL),$(shell $(VBOX_BLD_PYTHON) $(PATH_SUB_CURRENT)/gen_python_deps.py)))
+$(eval $(patsubst %|,%$(NL),$(shell $(VBOX_BLD_PYTHON) $(PATH_SUB_CURRENT)/gen_python_deps.py $(KBUILD_TARGET) $(KBUILD_TARGET_ARCH))))
 
 # Python Client Module - the C++/XPCOM bits.

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

@@ -23 +23 @@
 known = {}
 
-def checkPair(p,v,dllpre,dllsuff):
+def checkPair(p, v,dllpre,dllsuff, do_bitness_magic):
     file =  os.path.join(p, "include", "python"+v, "Python.h")
-    # or just stat()?
     if not os.path.isfile(file):
         return None
+    if do_bitness_magic:
+        lib64 = os.path.join(p, "lib", "64", dllpre+"python"+v+dllsuff)
+    else:
+        lib64 = None
     return [os.path.join(p, "include", "python"+v), 
-            os.path.join(p, "lib", dllpre+"python"+v+dllsuff)]
+            os.path.join(p, "lib", dllpre+"python"+v+dllsuff),
+            lib64]
+
+def print_vars(vers, known, sep, do_bitness_magic):
+    print "VBOX_PYTHON%s_INC=%s%s" %(vers, known[0], sep)
+    if do_bitness_magic:
+       print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep)
+    else:
+       print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[1], sep)
+
 
 def main(argv):
     dllpre = "lib"
     dllsuff = ".so"
-    if sys.platform == 'darwin':
+    do_bitness_magic = 0
+
+    if len(argv) > 1:
+        target = argv[1]
+    else:
+        target = sys.platform
+
+    if len(argv) > 2:
+        arch = argv[2]   
+    else:
+        arch = "unknown"
+
+    if target == 'darwin':
         prefixes.insert(0, '/Developer/SDKs/MacOSX10.4u.sdk/usr')
         prefixes.insert(0, '/Developer/SDKs/MacOSX10.5.sdk/usr')
         dllsuff = '.dylib'
+
+    if target == 'solaris' and arch == 'amd64':
+        do_bitness_magic = 1
     
     for v in versions:
         for p in prefixes:
-            c = checkPair(p, v, dllpre, dllsuff)
+            c = checkPair(p, v, dllpre, dllsuff, do_bitness_magic)
             if c is not None:
                 known[v] = c
@@ -55 +82 @@
             d = k
         vers = k.replace('.', '')
-        print "VBOX_PYTHON%s_INC=%s%s" %(vers, known[k][0], sep)
-        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[k][1], sep)
+        print_vars(vers, known[k], sep, do_bitness_magic)
     if d is not None:
-        print "VBOX_PYTHONDEF_INC=%s%s" %(known[d][0], sep)
-        print "VBOX_PYTHONDEF_LIB=%s%s" %(known[d][1], sep)
+        print_vars("DEF", known[d], sep, do_bitness_magic) 
 
 if __name__ == '__main__':