Changeset 28367 in vbox

Timestamp:

Apr 15, 2010 2:44:42 PM (15 years ago)

Author:

vboxsync

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

60127

Message:

python: single Python selection support in multiversion

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/python/gen_python_deps.py (modified) (5 diffs)

trunk/Config.kmk

@@ -455 +455 @@
 # Enables the Python<->XPCOM and Python<->COM bindings.
 VBOX_WITH_PYTHON ?= 1
+# Build against multiple Python versions present in the system 
+VBOX_WITH_MULTIVERSION_PYTHON ?= 1
 # Enable the kchmviewer.
 VBOX_WITH_KCHMVIEWER = 1

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

@@ -38 +38 @@
     else:
         lib64 = None
-    return [os.path.join(p, "include", "python"+v), 
+    return [os.path.join(p, "include", "python"+v),
             lib,
             lib64]
@@ -51 +51 @@
 
 def main(argv):
+    global prefixes
+    global versions
+
     dllpre = "lib"
     dllsuff = ".so"
@@ -61 +64 @@
 
     if len(argv) > 2:
-        arch = argv[2]   
+        arch = argv[2]
     else:
         arch = "unknown"
+
+    if len(argv) > 3:
+        multi = int(argv[3])
+    else:
+        multi = 1
+
+    if multi == 0:
+        prefixes = ["/usr"]
+        versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
 
     if target == 'darwin':
@@ -89 +101 @@
     keys.sort()
     d = None
-    # We need separator other than newline, to sneak through $(shell)  
+    # We need separator other than newline, to sneak through $(shell)
     sep = "|"
     for k in keys:
@@ -97 +109 @@
         print_vars(vers, known[k], sep, bitness_magic)
     if d is not None:
-        print_vars("DEF", known[d], sep, bitness_magic) 
+        print_vars("DEF", known[d], sep, bitness_magic)
 
 if __name__ == '__main__':