[Scipy-svn] r3987 - in branches/build_with_scons/scipy/sparse/linalg: . dsolve

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-05 06:22:33 -0600 (Wed, 05 Mar 2008)
New Revision: 3987

Added:
   branches/build_with_scons/scipy/sparse/linalg/setupscons.py
Modified:
   branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct
Log:
sparse.linalg now builds with numscons.

Modified: branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct
===================================================================
--- branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct	2008-03-05 10:06:57 UTC (rev 3986)
+++ branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct	2008-03-05 12:22:33 UTC (rev 3987)
@@ -32,12 +32,12 @@
 superlu_def['USE_VENDOR_BLAS'] = 2
 superlu_env.Append(CPPDEFINES = superlu_def)
 
-superlu_src = [str(s) for s in superlu_env.Glob(pjoin('SuperLU', 'SRC', '*.c'))]
+superlu_src = superlu_env.Glob(pjoin('SuperLU', 'SRC', '*.c'))
 superlu = superlu_env.NumpyStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions
 pyenv = env.Copy()
-pyenv.Append(CPPPATH = get_numpy_include_dirs())
+pyenv.Append(CPPPATH = [get_numpy_include_dirs(), env['src_dir']])
 common_src = ['_superlu_utils.c', '_superluobject.c']
 
 for prec in ['z', 'd', 'c', 's']:

Copied: branches/build_with_scons/scipy/sparse/linalg/setupscons.py (from rev 3979, branches/build_with_scons/scipy/sparse/linalg/setup.py)
===================================================================
--- branches/build_with_scons/scipy/sparse/linalg/setup.py	2008-03-05 08:14:54 UTC (rev 3979)
+++ branches/build_with_scons/scipy/sparse/linalg/setupscons.py	2008-03-05 12:22:33 UTC (rev 3987)
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    
+    config = Configuration('linalg',parent_package,top_path, 
+                           setup_name = 'setupscons.py')
+    
+    config.add_subpackage(('isolve'))
+    config.add_subpackage(('dsolve'))
+    config.add_subpackage(('eigen'))
+    
+    config.add_data_dir('tests')
+    
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())