[Scipy-svn] r3565 - in branches/scipy.scons/scipy: fftpack integrate interpolate lib lib/blas lib/lapack linalg

[scipy-svn at scipy.org]

Author: cdavid
Date: 2007-11-21 21:20:10 -0600 (Wed, 21 Nov 2007)
New Revision: 3565

Added:
   branches/scipy.scons/scipy/lib/blas/setupscons.py
   branches/scipy.scons/scipy/lib/lapack/setupscons.py
   branches/scipy.scons/scipy/lib/setupscons.py
Modified:
   branches/scipy.scons/scipy/fftpack/SConstruct
   branches/scipy.scons/scipy/integrate/SConstruct
   branches/scipy.scons/scipy/interpolate/SConstruct
   branches/scipy.scons/scipy/linalg/SConstruct
Log:
Change F2PY calls to F2py for sconscripts

Modified: branches/scipy.scons/scipy/fftpack/SConstruct
===================================================================
--- branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
+++ branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-22 03:20:10 UTC (rev 3565)
@@ -1,4 +1,4 @@
-# Last Change: Wed Nov 21 08:00 PM 2007 J
+# Last Change: Thu Nov 22 12:00 PM 2007 J
 # vim:syntax=python
 from os.path import join as pjoin
 import glob
@@ -21,11 +21,11 @@
 
 # Build _fftpack
 src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c']
-wsrc = env.F2PY(pjoin(env['build_dir'], '_fftpackmodule.c'),
+wsrc = env.F2py(pjoin(env['build_dir'], '_fftpackmodule.c'),
                 pjoin(env['build_dir'], 'fftpack.pyf'))
 env.NumpyPythonExtension('_fftpack', source = src + wsrc)
 
 # Build convolve
 src = ['src/convolve.c']
-wsrc = env.F2PY(pjoin(env['build_dir'], 'convolve.pyf'))
+wsrc = env.F2py(pjoin(env['build_dir'], 'convolve.pyf'))
 env.NumpyPythonExtension('convolve', source = src + wsrc)

Modified: branches/scipy.scons/scipy/integrate/SConstruct
===================================================================
--- branches/scipy.scons/scipy/integrate/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
+++ branches/scipy.scons/scipy/integrate/SConstruct	2007-11-22 03:20:10 UTC (rev 3565)
@@ -1,4 +1,4 @@
-# Last Change: Wed Nov 21 08:00 PM 2007 J
+# Last Change: Thu Nov 22 12:00 PM 2007 J
 # vim:syntax=python
 from os.path import join as pjoin
 import glob

Modified: branches/scipy.scons/scipy/interpolate/SConstruct
===================================================================
--- branches/scipy.scons/scipy/interpolate/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
+++ branches/scipy.scons/scipy/interpolate/SConstruct	2007-11-22 03:20:10 UTC (rev 3565)
@@ -1,4 +1,4 @@
-# Last Change: Wed Nov 21 08:00 PM 2007 J
+# Last Change: Thu Nov 22 12:00 PM 2007 J
 # vim:syntax=python
 from os.path import join as pjoin
 import glob
@@ -28,6 +28,6 @@
 env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
 
 # Build dfitpack
-dfitpack_wrap = env.F2PY(pjoin(env['build_dir'], 'dfitpack'), 
+dfitpack_wrap = env.F2py(pjoin(env['build_dir'], 'dfitpack'), 
                          pjoin(env['build_dir'], 'fitpack.pyf')) 
 env.NumpyPythonExtension('dfitpack', source = dfitpack_wrap)

Copied: branches/scipy.scons/scipy/lib/blas/setupscons.py (from rev 3564, branches/scipy.scons/scipy/lib/blas/setup.py)

Copied: branches/scipy.scons/scipy/lib/lapack/setupscons.py (from rev 3564, branches/scipy.scons/scipy/lib/lapack/setup.py)

Copied: branches/scipy.scons/scipy/lib/setupscons.py (from rev 3564, branches/scipy.scons/scipy/lib/setup.py)
===================================================================
--- branches/scipy.scons/scipy/lib/setup.py	2007-11-22 02:45:18 UTC (rev 3564)
+++ branches/scipy.scons/scipy/lib/setupscons.py	2007-11-22 03:20:10 UTC (rev 3565)
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration('lib',parent_package,top_path, setup_name = 'setupscons.py')
+    config.add_subpackage('blas')
+    config.add_subpackage('lapack')
+
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+
+    setup(**configuration(top_path='').todict())

Modified: branches/scipy.scons/scipy/linalg/SConstruct
===================================================================
--- branches/scipy.scons/scipy/linalg/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
+++ branches/scipy.scons/scipy/linalg/SConstruct	2007-11-22 03:20:10 UTC (rev 3565)
@@ -1,4 +1,4 @@
-# Last Change: Tue Nov 20 08:00 PM 2007 J
+# Last Change: Thu Nov 22 12:00 PM 2007 J
 # vim:syntax=python
 
 import os
@@ -120,7 +120,7 @@
 #   _flinalg
 #----------------
 _flinalg_fsrc = ['det.f', 'lu.f']
-_flinalg_src = env.F2PY(
+_flinalg_src = env.F2py(
     pjoin(env['build_dir'], 'src', '_flinalgmodule.c'), 
     source = [pjoin(env['build_dir'], 'src', i) for i in _flinalg_fsrc])
 
@@ -130,7 +130,7 @@
 #----------------
 # calc_lwork:
 #----------------
-calc_src = env.F2PY(pjoin(env['build_dir'], 'src', 'calc_lworkmodule.c'), 
+calc_src = env.F2py(pjoin(env['build_dir'], 'src', 'calc_lworkmodule.c'), 
                     source = pjoin(env['build_dir'], 'src', 'calc_lwork.f'))
 env.NumpyPythonExtension('calc_lwork', 
                          source = calc_src + [pjoin('src', 'calc_lwork.f')])