Changeset 20952 in vbox for trunk/src/libs

Timestamp:

Jun 25, 2009 4:18:39 PM (16 years ago)

Author:

vboxsync

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

49132

Message:

Python: multiversion cleanup

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)))
 
 # Python Client Module - the C++/XPCOM bits.

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

@@ -26 +26 @@
     file =  os.path.join(p, "include", "python"+v, "Python.h")
     # or just stat()?
-    try:
-        lf = open(file, 'r')
-    except IOError,e:
+    if not os.path.isfile(file):
         return None
-    lf.close()
     return [os.path.join(p, "include", "python"+v), 
             os.path.join(p, "lib", "libpython"+v+".so")]
@@ -45 +42 @@
     keys.sort()
     d = None
+    # We need separator other than newline, to sneak through $(shell)  
+    sep = "|"
     for k in keys:
         if d is None:
             d = k
         vers = k.replace('.', '')
-        print "VBOX_PYTHON%s_INC=%s|" %(vers, known[k][0])
-        print "VBOX_PYTHON%s_LIB=%s|" %(vers, known[k][1])
+        print "VBOX_PYTHON%s_INC=%s%s" %(vers, known[k][0], sep)
+        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[k][1], sep)
     if d is not None:
-        print "VBOX_PYTHONDEF_INC=%s|" %(known[d][0])
-        print "VBOX_PYTHONDEF_LIB=%s|" %(known[d][1])
+        print "VBOX_PYTHONDEF_INC=%s%s" %(known[d][0], sep)
+        print "VBOX_PYTHONDEF_LIB=%s%s" %(known[d][1], sep)
 
 if __name__ == '__main__':