[Numpy-svn] r4277 - branches/numpy.scons/numpy/distutils/scons

numpy-svn@scip... numpy-svn@scip...
Thu Oct 25 00:07:13 CDT 2007


Author: cdavid
Date: 2007-10-25 00:07:07 -0500 (Thu, 25 Oct 2007)
New Revision: 4277

Modified:
   branches/numpy.scons/numpy/distutils/scons/libinfo.py
   branches/numpy.scons/numpy/distutils/scons/libinfo_scons.py
Log:
Parse correctly multi libs in site.cfg in NumpyChecker.

Modified: branches/numpy.scons/numpy/distutils/scons/libinfo.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/libinfo.py	2007-10-24 05:46:03 UTC (rev 4276)
+++ branches/numpy.scons/numpy/distutils/scons/libinfo.py	2007-10-25 05:07:07 UTC (rev 4277)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Fri Oct 05 02:00 PM 2007 J
+# Last Change: Thu Oct 25 01:00 PM 2007 J
 
 # Module for support to look for external code (replacement of
 # numpy.distutils.system_info). KEEP THIS INDEPENDANT OF SCONS !
@@ -51,7 +51,8 @@
 def parse_config_param(var):
     """Given var, the output of ConfirParser.get(section, name), returns a list
     of each item of its content."""
-    pass
+    varl = var.split(',')
+    return [i.strip() for i in varl]
 
 def get_paths(var):
     """Given var, the output of ConfirParser.get(section, name), returns a list

Modified: branches/numpy.scons/numpy/distutils/scons/libinfo_scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/libinfo_scons.py	2007-10-24 05:46:03 UTC (rev 4276)
+++ branches/numpy.scons/numpy/distutils/scons/libinfo_scons.py	2007-10-25 05:07:07 UTC (rev 4277)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Tue Oct 09 04:00 PM 2007 J
+# Last Change: Thu Oct 25 01:00 PM 2007 J
 
 # Module for support to look for external code (replacement of
 # numpy.distutils.system_info). scons dependant code.
@@ -8,7 +8,7 @@
 
 from SCons.Util import is_List
 
-from libinfo import get_config, get_paths
+from libinfo import get_config, get_paths, parse_config_param
 from utils import get_empty
 
 _SYMBOL_DEF_STR = """
@@ -155,6 +155,8 @@
     # section, it takes precedence on the arguments libs, libpath,
     # cpppath.
     res = 1
+
+    # XXX: refactor this mess
     try:
         newLIBPATH = get_paths(siteconfig.get(section, 'library_dirs'))
     except ConfigParser.NoSectionError, e:
@@ -172,7 +174,7 @@
             newCPPPATH = []
 
     try:
-        newLIBS = siteconfig.get(section, 'libraries') 
+        newLIBS = parse_config_param(siteconfig.get(section, 'libraries'))
     except ConfigParser.NoSectionError, e:
         if libs:
             newLIBS = libs



More information about the Numpy-svn mailing list