[Scipy-svn] r4427 - in trunk/scipy: cluster fftpack integrate interpolate io lib/blas lib/lapack linalg ndimage odr optimize signal sparse/linalg/dsolve sparse/linalg/dsolve/umfpack sparse/linalg/eigen/arpack sparse/linalg/isolve sparse/sparsetools special stats stsci/convolve stsci/image

scipy-svn@scip... scipy-svn@scip...
Thu Jun 12 05:09:10 CDT 2008


Author: cdavid
Date: 2008-06-12 05:07:55 -0500 (Thu, 12 Jun 2008)
New Revision: 4427

Added:
   trunk/scipy/cluster/SConscript
   trunk/scipy/fftpack/SConscript
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/io/SConscript
   trunk/scipy/lib/blas/SConscript
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/linalg/SConscript
   trunk/scipy/ndimage/SConscript
   trunk/scipy/odr/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/signal/SConscript
   trunk/scipy/sparse/linalg/dsolve/SConscript
   trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/sparse/linalg/isolve/SConscript
   trunk/scipy/sparse/sparsetools/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
   trunk/scipy/stsci/convolve/SConscript
   trunk/scipy/stsci/image/SConscript
Removed:
   trunk/scipy/cluster/SConstruct
   trunk/scipy/fftpack/SConstruct
   trunk/scipy/integrate/SConstruct
   trunk/scipy/interpolate/SConstruct
   trunk/scipy/io/SConstruct
   trunk/scipy/lib/blas/SConstruct
   trunk/scipy/lib/lapack/SConstruct
   trunk/scipy/linalg/SConstruct
   trunk/scipy/ndimage/SConstruct
   trunk/scipy/odr/SConstruct
   trunk/scipy/optimize/SConstruct
   trunk/scipy/signal/SConstruct
   trunk/scipy/sparse/linalg/dsolve/SConstruct
   trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct
   trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
   trunk/scipy/sparse/linalg/isolve/SConstruct
   trunk/scipy/sparse/sparsetools/SConstruct
   trunk/scipy/special/SConstruct
   trunk/scipy/stats/SConstruct
   trunk/scipy/stsci/convolve/SConstruct
   trunk/scipy/stsci/image/SConstruct
Log:
Move all scons SConstruct to SConscript, for upcoming adpatation to new numscons build_dir architecture.

Copied: trunk/scipy/cluster/SConscript (from rev 4426, trunk/scipy/cluster/SConstruct)

Deleted: trunk/scipy/cluster/SConstruct
===================================================================
--- trunk/scipy/cluster/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/cluster/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,19 +0,0 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
-# vim:syntax=python
-from os.path import join
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('_vq', source = [join('src', 'vq_module.c'),
-                                          join('src', 'vq.c')])
-
-env.NumpyPythonExtension('_hierarchy_wrap', source = [join('src', 'hierarchy_wrap.c'),
-                                          join('src', 'hierarchy.c')])
-
-
-env.NumpyPythonExtension('_distance_wrap', source = [join('src', 'distance_wrap.c'),
-                                          join('src', 'distance.c')])

Copied: trunk/scipy/fftpack/SConscript (from rev 4426, trunk/scipy/fftpack/SConstruct)

Deleted: trunk/scipy/fftpack/SConstruct
===================================================================
--- trunk/scipy/fftpack/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/fftpack/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,44 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment, write_info
-from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
-# Check fft implementation
-config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT})
-has_fft = config.CheckFFT()
-config.Finish()
-write_info(env)
-
-# Tweak defineds depending on the fft used
-if has_fft:
-    if IsMKL(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_MKL_H")
-    elif IsFFTW3(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW3_H")
-    elif IsFFTW2(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW2_H")
-    else:
-        pass
-
-# Build dfftpack
-src = env.NumpyGlob(pjoin('dfftpack', '*.f'))
-dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
-env.PrependUnique(LIBS = ['dfftpack'])
-env.PrependUnique(LIBPATH = env['build_dir'])
-
-# Build _fftpack
-src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c', 'fftpack.pyf']
-env.NumpyPythonExtension('_fftpack', src)
-
-# Build convolve
-src = ['src/convolve.c',  'convolve.pyf']
-env.NumpyPythonExtension('convolve', src)

Copied: trunk/scipy/integrate/SConscript (from rev 4426, trunk/scipy/integrate/SConstruct)

Deleted: trunk/scipy/integrate/SConstruct
===================================================================
--- trunk/scipy/integrate/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/integrate/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,61 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-import warnings
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77BLAS
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-# Configuration
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib,
-                                            'CheckF77BLAS' : CheckF77BLAS})
-
-if not config.CheckF77Clib():
-    raise Exception("Could not check F77 runtime, needed for interpolate")
-if not config.CheckF77BLAS():
-    raise Exception("Could not find F77 BLAS, needed for integrate package")
-
-config.Finish()
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
-# XXX: lapack integration
-
-# Build linpack_lite
-src = [str(s) for s in env.NumpyGlob(pjoin('linpack_lite', '*.f'))]
-linpack_lite = env.NumpyStaticExtLibrary('linpack_lite', source = src)
-
-# Build mach
-# XXX: do not use optimization flags for mach
-src = [str(s) for s in env.NumpyGlob(pjoin('mach', '*.f'))]
-mach = env.NumpyStaticExtLibrary('mach', source = src)
-
-# Build quadpack
-src = [str(s) for s in env.NumpyGlob(pjoin('quadpack', '*.f'))]
-quadpack = env.NumpyStaticExtLibrary('quadpack', source = src)
-
-# Build odepack
-src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
-odepack = env.NumpyStaticExtLibrary('odepack', source = src)
-
-env.AppendUnique(LIBPATH = env['build_dir'])
-env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
-
-quadenv = env.Clone()
-quadenv.Prepend(LIBS = ['quadpack', 'linpack_lite', 'mach'])
-
-odenv = env.Clone()
-odenv.Prepend(LIBS = ['odepack', 'linpack_lite', 'mach'])
-
-# Build _quadpack
-quadenv.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c')
-
-# Build _odepack
-odenv.NumpyPythonExtension('_odepack', source = '_odepackmodule.c')
-
-# Build vode
-odenv.NumpyPythonExtension('vode', source = 'vode.pyf')

Copied: trunk/scipy/interpolate/SConscript (from rev 4426, trunk/scipy/interpolate/SConstruct)

Deleted: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/interpolate/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,31 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment, CheckF77Clib
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
-if not config.CheckF77Clib():
-    raise Exception("Could not check F77 runtime, needed for interpolate")
-config.Finish()
-
-env.PrependUnique(CPPPATH = get_numpy_include_dirs())
-env.PrependUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# Build fitpack
-src = [str(s) for s in env.NumpyGlob(pjoin('fitpack', '*.f'))]
-fitpack = env.NumpyStaticExtLibrary('fitpack', source = src)
-
-env.PrependUnique(LIBS = ['fitpack'])
-env.PrependUnique(LIBPATH = [env['build_dir']])
-
-# Build _fitpack
-env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
-
-# Build dfitpack
-env.NumpyPythonExtension('dfitpack', source = 'fitpack.pyf')

Copied: trunk/scipy/io/SConscript (from rev 4426, trunk/scipy/io/SConstruct)

Deleted: trunk/scipy/io/SConstruct
===================================================================
--- trunk/scipy/io/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/io/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,11 +0,0 @@
-# Last Change: Wed Mar 05 03:00 PM 2008 J
-# vim:syntax=python
-from os.path import join
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('numpyio', source = 'numpyiomodule.c')

Copied: trunk/scipy/lib/blas/SConscript (from rev 4426, trunk/scipy/lib/blas/SConstruct)

Deleted: trunk/scipy/lib/blas/SConstruct
===================================================================
--- trunk/scipy/lib/blas/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/lib/blas/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,85 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-
-import os
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
-from numscons import GetNumpyEnvironment
-from numscons import CheckCBLAS, CheckF77BLAS,\
-                     IsVeclib, IsAccelerate, \
-                     IsATLAS, GetATLASVersion
-from numscons import write_info
-
-from scons_support import do_generate_fake_interface, generate_interface_emitter
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-env['BUILDERS']['GenerateFakePyf'] = Builder(action = do_generate_fake_interface,
-                                             emitter = generate_interface_emitter)
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckCBLAS' : CheckCBLAS,
-                                            'CheckBLAS' : CheckF77BLAS})
-
-#--------------
-# Checking Blas
-#--------------
-st = config.CheckBLAS(check_version = 1)
-if not st:
-    raise RuntimeError("no blas found, necessary for linalg module")
-if IsATLAS(env, 'blas'):
-    version = GetATLASVersion(env)
-    env.Append(CPPDEFINES = [('ATLAS_INFO', '"\\"%s"\\"' % version)])
-else:
-    env.Append(CPPDEFINES = [('NO_ATLAS_INFO', 1)])
-
-if config.CheckCBLAS():
-    has_cblas = 1
-else:
-    has_cblas = 0
-
-config.Finish()
-write_info(env)
-
-#==========
-#  Build
-#==========
-
-# XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(F2PYOPTIONS = '--quiet')
-
-#------------
-#   fblas
-#------------
-env.NumpyFromFTemplate('fblas.pyf', 'fblas.pyf.src')
-source = ['fblas.pyf']
-if IsVeclib(env, 'blas') or IsAccelerate(env, 'blas'):
-    env.NumpyFromCTemplate('fblaswrap_veclib_c.c', 'fblaswrap_veclib_c.c.src')
-    source.append('fblaswrap_veclib_c.c')
-else:
-    env.NumpyFromFTemplate('fblaswrap.f', 'fblaswrap.f.src')
-    source.append('fblaswrap.f')
-env.NumpyPythonExtension('fblas', source)
-
-#------------
-#   cblas
-#------------
-source = ['cblas.pyf']
-if has_cblas:
-    env.NumpyFromFTemplate('cblas.pyf', 'cblas.pyf.src')
-else:
-    print env.GenerateFakePyf('cblas', 'cblas.pyf.src')
-env.NumpyPythonExtension('cblas', source)

Copied: trunk/scipy/lib/lapack/SConscript (from rev 4426, trunk/scipy/lib/lapack/SConstruct)

Deleted: trunk/scipy/lib/lapack/SConstruct
===================================================================
--- trunk/scipy/lib/lapack/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/lib/lapack/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,95 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-
-import os
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77LAPACK,\
-                                  CheckCLAPACK, \
-                                  IsATLAS, GetATLASVersion, \
-                                  CheckF77Clib
-from numscons import write_info
-
-from scons_support import do_generate_fake_interface, \
-                          generate_interface_emitter
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckCLAPACK' : CheckCLAPACK,
-                                            'CheckLAPACK' : CheckF77LAPACK,
-                                            'CheckF77Clib' : CheckF77Clib})
-
-#--------------
-# Checking Blas
-#--------------
-if not config.CheckF77Clib():
-    raise RuntimeError("Could not check F/C runtime library for %s/%s, " \
-                       "contact the maintainer" % (env['CC'], env['F77']))
-
-st = config.CheckLAPACK(check_version = 1)
-if not st:
-    raise RuntimeError("no lapack found, necessary for lapack module")
-
-if IsATLAS(env, 'lapack'):
-    version = GetATLASVersion(env)
-    env.Append(CPPDEFINES = [('ATLAS_INFO', '"\\"%s"\\"' % version)])
-else:
-    env.Append(CPPDEFINES = [('NO_ATLAS_INFO', 1)])
-
-if config.CheckCLAPACK():
-    has_clapack = 1
-else:
-    has_clapack = 0
-
-config.Finish()
-write_info(env)
-
-#==========
-#  Build
-#==========
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(F2PYOPTIONS = '--quiet')
-
-env['BUILDERS']['GenerateFakePyf'] = Builder(action = do_generate_fake_interface,
-                                  emitter = generate_interface_emitter)
-
-#------------
-#   flapack
-#------------
-yop = env.NumpyFromFTemplate('flapack.pyf', 'flapack.pyf.src')
-env.NumpyPythonExtension('flapack', source = ['flapack.pyf'])
-
-#------------
-#   clapack
-#------------
-if has_clapack:
-    env.NumpyFromFTemplate('clapack.pyf', 'clapack.pyf.src')
-else:
-    env.GenerateFakePyf('clapack', 'clapack.pyf.src')
-env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
-
-#----------------
-# calc_lwork:
-#----------------
-calc_src = env.NumpyF2py(pjoin('calc_lworkmodule.c'), 
-                         source = pjoin('calc_lwork.f'))
-env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-#--------------
-# Atlas version
-#--------------
-env.NumpyPythonExtension('atlas_version', 'atlas_version.c')

Copied: trunk/scipy/linalg/SConscript (from rev 4426, trunk/scipy/linalg/SConstruct)

Deleted: trunk/scipy/linalg/SConstruct
===================================================================
--- trunk/scipy/linalg/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/linalg/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,159 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-
-import os
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
-from numscons import GetNumpyEnvironment
-from numscons import CheckCBLAS, CheckF77BLAS, CheckF77LAPACK,\
-                                  CheckCLAPACK, IsVeclib, IsAccelerate, \
-                                  IsATLAS, GetATLASVersion, CheckF77Clib
-from numscons import write_info
-
-from scons_support import do_generate_interface, do_generate_fake_interface, \
-                          generate_interface_emitter
-
-#from scons_support import CheckBrokenMathlib, define_no_smp, \
-#    generate_config_header, generate_config_header_emitter
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-
-# XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(F2PYOPTIONS = '--quiet')
-
-env['BUILDERS']['haha'] = Builder(action = do_generate_interface,
-                                  emitter = generate_interface_emitter)
-
-env['BUILDERS']['hihi'] = Builder(action = do_generate_fake_interface,
-                                  emitter = generate_interface_emitter)
-
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-fenv = env.Clone()
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.Configure(custom_tests = {'CheckCBLAS' : CheckCBLAS,
-                                       'CheckCLAPACK' : CheckCLAPACK})
-
-#-------------------------
-# Checking cblas/clapack
-#-------------------------
-if config.CheckCBLAS():
-    has_cblas = 1
-else:
-    has_cblas = 0
-if has_cblas:
-    if IsATLAS(env, 'cblas'):
-        version = GetATLASVersion(env)
-        env.Append(CPPDEFINES = [('ATLAS_INFO', '"\\"%s"\\"' % version)])
-    else:
-        env.Append(CPPDEFINES = [('NO_ATLAS_INFO', 1)])
-
-if config.CheckCLAPACK():
-    has_clapack = 1
-else:
-    has_clapack = 0
-
-config.Finish()
-write_info(env)
-
-#---------------------------
-# Checking F77 blas/lapack
-#---------------------------
-fconfig = fenv.Configure(custom_tests = {'CheckBLAS' : CheckF77BLAS,
-                         'CheckLAPACK' : CheckF77LAPACK,
-                         'CheckF77Clib' : CheckF77Clib})
-
-if not fconfig.CheckF77Clib():
-    raise RuntimeError("Could not check F/C runtime library for %s/%s, " \
-                       "contact the maintainer" % (fenv['CC'], fenv['F77']))
-
-st = fconfig.CheckBLAS(check_version = 1)
-if not st:
-    raise RuntimeError("no blas found, necessary for linalg module")
-if IsATLAS(fenv, 'blas'):
-    version = GetATLASVersion(fenv)
-    env.Append(CPPDEFINES = [('ATLAS_INFO', '"\\"%s"\\"' % version)])
-else:
-    env.Append(CPPDEFINES = [('NO_ATLAS_INFO', 1)])
-
-st = fconfig.CheckLAPACK()
-if not st:
-    raise RuntimeError("no lapack found, necessary for linalg module")
-fconfig.Finish()
-write_info(fenv)
-
-
-#==========
-#  Build
-#==========
-#------------
-#   fblas
-#------------
-fenv.haha('fblas', 'generic_fblas.pyf')
-source = ['fblas.pyf']
-if IsVeclib(fenv, 'blas') or IsAccelerate(fenv, 'blas'):
-    source.append(pjoin('src', 'fblaswrap_veclib_c.c'))
-else:
-    source.append(pjoin('src', 'fblaswrap.f'))
-fenv.NumpyPythonExtension('fblas', source)
-
-#------------
-#   cblas
-#------------
-if has_cblas:
-    env.haha('cblas', 'generic_cblas.pyf')
-else:
-    env.hihi('cblas', 'generic_cblas.pyf')
-env.NumpyPythonExtension('cblas', source = 'cblas.pyf')
-
-#------------
-#   flapack
-#------------
-yop = fenv.haha('flapack', 'generic_flapack.pyf')
-# XXX: automatically scan dependency on flapack_user_routines.pyf ?
-fenv.Depends(yop, pjoin(env['build_dir'], 'flapack_user_routines.pyf'))
-fenv.NumpyPythonExtension('flapack', 'flapack.pyf')
-
-#------------
-#   clapack
-#------------
-if has_clapack:
-    env.haha('clapack', 'generic_clapack.pyf')
-else:
-    env.hihi('clapack', 'generic_clapack.pyf')
-env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
-
-#----------------
-#   _flinalg
-#----------------
-flinalg_fsrc = [pjoin('src', i) for i in ['det.f', 'lu.f']]
-flinalg_src = fenv.NumpyF2py(pjoin('src', '_flinalgmodule.c'), flinalg_fsrc)
-
-fenv.NumpyPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
-
-#----------------
-# calc_lwork:
-#----------------
-calc_fsrc = [pjoin('src', 'calc_lwork.f')]
-calc_src = env.NumpyF2py(pjoin('src', 'calc_lworkmodule.c'), calc_fsrc)
-fenv.NumpyPythonExtension('calc_lwork', calc_src + calc_fsrc)
-
-#--------------
-# Atlas version
-#--------------
-atlas_env = env.Clone()
-if not IsATLAS(env, 'cblas'):
-    atlas_env.AppendUnique(CPPDEFINES = "NO_ATLAS_INFO")
-atlas_env.NumpyPythonExtension('atlas_version', 'atlas_version.c')

Copied: trunk/scipy/ndimage/SConscript (from rev 4426, trunk/scipy/ndimage/SConstruct)

Deleted: trunk/scipy/ndimage/SConstruct
===================================================================
--- trunk/scipy/ndimage/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/ndimage/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,22 +0,0 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
-from os.path import join
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = 'src')
-
-ndimage_src = ["nd_image.c", "ni_filters.c", "ni_fourier.c", "ni_interpolation.c",
-               "ni_measure.c", "ni_morphology.c", "ni_support.c"]
-env.NumpyPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
-
-segment_src = ['Segmenter_EXT.c', 'Segmenter_IMPL.c']
-env.NumpyPythonExtension('_segment', source = [join('src', 'segment', i) 
-                                               for i in segment_src])
-
-register_src = ['Register_EXT.c', 'Register_IMPL.c']
-env.NumpyPythonExtension('_register', source = [join('src', 'register', i) 
-                                                for i in register_src])

Copied: trunk/scipy/odr/SConscript (from rev 4426, trunk/scipy/odr/SConstruct)

Deleted: trunk/scipy/odr/SConstruct
===================================================================
--- trunk/scipy/odr/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/odr/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,62 +0,0 @@
-# Last Change: Wed Mar 05 04:00 PM 2008 J
-# vim:syntax=python
-
-import os
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77BLAS, CheckF77Clib
-
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckBLAS' : CheckF77BLAS, 
-                                            'CheckF77Clib' : CheckF77Clib})
-
-if not config.CheckF77Clib():
-    raise RuntimeError("Could not check F/C runtime library for %s/%s, " \
-                       "contact the maintainer" % (env['CC'], env['F77']))
-
-#--------------
-# Checking Blas
-#--------------
-st = config.CheckBLAS()
-if not st:
-    has_blas = 0
-else:
-    has_blas = 1
-
-config.Finish()
-write_info(env)
-
-#==========
-#  Build
-#==========
-
-# odr lib
-libodr_src = [pjoin('odrpack', i) for i in ['d_odr.f', 'd_mprec.f', 'dlunoc.f']]
-if has_blas:
-    libodr_src.append(pjoin('odrpack', 'd_lpk.f'))
-else:
-    libodr_src.append(pjoin('odrpack', 'd_lpkbls.f'))
-
-env.NumpyStaticExtLibrary('odrpack', source = libodr_src)
-
-env.PrependUnique(LIBS = 'odrpack')
-env.PrependUnique(LIBPATH = env['build_dir'])
-
-# odr pyextension
-env.NumpyPythonExtension('__odrpack', '__odrpack.c',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])

Copied: trunk/scipy/optimize/SConscript (from rev 4426, trunk/scipy/optimize/SConstruct)

Deleted: trunk/scipy/optimize/SConstruct
===================================================================
--- trunk/scipy/optimize/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/optimize/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,91 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-
-import os
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77LAPACK, CheckF77Clib
-
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-env.Append(CPPPATH = get_numpy_include_dirs())
-env.Append(CPPPATH = env['F2PYINCLUDEDIR'])
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK,
-                                            'CheckF77Clib' : CheckF77Clib})
-
-#-----------------
-# Checking Lapack
-#-----------------
-if not config.CheckF77Clib():
-    raise RuntimeLibrary("Could not check C/F runtime library for %s/%s"\
-                         " , contact the maintainer" % (env['CC'], env['F77']))
-
-st = config.CheckLAPACK()
-if not st:
-    has_lapack = 0
-else:
-    has_lapack = 1
-
-config.Finish()
-write_info(env)
-
-#==========
-#  Build
-#==========
-
-# minpack lib
-minpack_src = [str(s) for s in env.NumpyGlob(pjoin('minpack', '*.f'))]
-env.NumpyStaticExtLibrary('minpack', source = minpack_src)
-
-# rootfind lib
-rootfind_src = [str(s) for s in env.NumpyGlob(pjoin('Zeros', '*.c'))]
-env.NumpyStaticExtLibrary('rootfind', source = rootfind_src)
-
-env.AppendUnique(LIBS = ['minpack', 'rootfind'])
-env.AppendUnique(LIBPATH = env['build_dir'])
-
-# _minpack pyextension
-env.NumpyPythonExtension('_minpack', '_minpackmodule.c',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# _zeros pyextension
-env.NumpyPythonExtension('_zeros', 'zeros.c')
-
-# _lbfgsb pyextension
-src = [pjoin('lbfgsb', i) for i in ['lbfgsb.pyf', 'routines.f']]
-env.NumpyPythonExtension('_lbfgsb', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# _cobyla pyextension
-src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f', 'cobyla.pyf']]
-env.NumpyPythonExtension('_cobyla', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# _minpack2 pyextension
-src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f', 'minpack2.pyf']]
-env.NumpyPythonExtension('minpack2', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# moduleTNC pyextension
-env.NumpyPythonExtension('moduleTNC', 
-                         source = [pjoin('tnc', i) for i in \
-                                                   ['moduleTNC.c', 'tnc.c']])
-
-# _slsqp pyextension
-src = [pjoin('slsqp', i) for i in ['slsqp_optmz.f', 'slsqp.pyf']]
-env.NumpyPythonExtension('_slsqp', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])

Copied: trunk/scipy/signal/SConscript (from rev 4426, trunk/scipy/signal/SConstruct)

Deleted: trunk/scipy/signal/SConstruct
===================================================================
--- trunk/scipy/signal/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/signal/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,19 +0,0 @@
-# Last Change: Wed Mar 05 05:00 PM 2008 J
-# vim:syntax=python
-from os.path import join
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('sigtools', 
-                         source = ['sigtoolsmodule.c',\
-                                   'firfilter.c', \
-                                   'medianfilter.c'])
-
-env.NumpyPythonExtension('spline', 
-                         source = ['splinemodule.c', 'S_bspline_util.c', 
-                                   'D_bspline_util.c', 'C_bspline_util.c', 
-                                   'Z_bspline_util.c','bspline_util.c'])

Copied: trunk/scipy/sparse/linalg/dsolve/SConscript (from rev 4426, trunk/scipy/sparse/linalg/dsolve/SConstruct)

Deleted: trunk/scipy/sparse/linalg/dsolve/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/sparse/linalg/dsolve/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,47 +0,0 @@
-from os.path import join as pjoin
-import sys
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77LAPACK
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckLapack' : CheckF77LAPACK})
-
-#-----------------
-# Checking Lapack
-#-----------------
-st = config.CheckLapack()
-if not st:
-    raise RuntimeError("no lapack found, necessary for dsolve module")
-
-config.Finish()
-write_info(env)
-
-# Build superlu lib
-superlu_env = env.Clone()
-superlu_def = {}
-if sys.platform == 'win32':
-    superlu_def['NO_TIMER'] = 1
-superlu_def['USE_VENDOR_BLAS'] = 2
-superlu_env.Append(CPPDEFINES = superlu_def)
-
-superlu_src = superlu_env.NumpyGlob(pjoin('SuperLU', 'SRC', '*.c'))
-superlu = superlu_env.NumpyStaticExtLibrary('superlu_src', source = superlu_src)
-
-# Build python extensions
-pyenv = env.Clone()
-pyenv.Append(CPPPATH = [get_numpy_include_dirs(), env['src_dir']])
-pyenv.Prepend(LIBS = superlu)
-common_src = ['_superlu_utils.c', '_superluobject.c']
-
-for prec in ['z', 'd', 'c', 's']:
-    pyenv.NumpyPythonExtension('_%ssuperlu' % prec, 
-                               source = common_src + \
-                                        ['_%ssuperlumodule.c' % prec]) 

Copied: trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript (from rev 4426, trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct)

Deleted: trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,35 +0,0 @@
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77BLAS, CheckF77Clib, NumpyCheckLibAndHeader
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = 
-    {'CheckBLAS' : CheckF77BLAS,
-     'CheckF77Clib' : CheckF77Clib,
-     'NumpyCheckLibAndHeader' : NumpyCheckLibAndHeader})
-
-#-----------------
-# Checking Lapack
-#-----------------
-st = config.CheckBLAS()
-if not st:
-    raise RuntimeError("no blas found, necessary for umfpack module")
-
-has_umfpack = config.NumpyCheckLibAndHeader(
-    'umfpack', None, 'umfpack.h', section = 'umfpack', autoadd = 1)
-config.Finish()
-write_info(env)
-
-if has_umfpack:
-    env.Append(SWIGFLAGS = '-python')
-    env.Append(SWIGFLAGS = '$_CPPINCFLAGS')
-    env.Append(CPPPATH = get_numpy_include_dirs())
-    env.NumpyPythonExtension('__umfpack', source = 'umfpack.i') 

Copied: trunk/scipy/sparse/linalg/eigen/arpack/SConscript (from rev 4426, trunk/scipy/sparse/linalg/eigen/arpack/SConstruct)

Deleted: trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,47 +0,0 @@
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77LAPACK, CheckF77Clib
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK,
-                                            'CheckF77Clib' : CheckF77Clib})
-
-env.Tool('numpyf2py')
-#-----------------
-# Checking Lapack
-#-----------------
-st = config.CheckF77Clib()
-st = config.CheckLAPACK(autoadd = 1)
-if not st:
-    raise RuntimeError("no lapack found, necessary for arpack module")
-
-config.Finish()
-write_info(env)
-
-# Build arpack
-arpack_src = env.NumpyGlob(pjoin('ARPACK', 'SRC', '*.f'))
-arpack_src += env.NumpyGlob(pjoin('ARPACK', 'UTIL', '*.f'))
-arpack_src += env.NumpyGlob(pjoin('ARPACK', 'LAPACK', '*.f'))
-
-src = [str(s) for s in arpack_src]
-
-env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))
-env.AppendUnique(F77PATH = pjoin(env['src_dir'], 'ARPACK', 'SRC'))
-env.AppendUnique(LIBPATH = env['build_dir'])
-arpack_lib = env.NumpyStaticExtLibrary('arpack', source = src)
-
-# Build _arpack extension
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-
-env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
-env.Prepend(LIBS = 'arpack')
-env.NumpyPythonExtension('_arpack', 'arpack.pyf')

Copied: trunk/scipy/sparse/linalg/isolve/SConscript (from rev 4426, trunk/scipy/sparse/linalg/isolve/SConstruct)

Deleted: trunk/scipy/sparse/linalg/isolve/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/sparse/linalg/isolve/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,58 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-
-from os.path import join as pjoin, splitext
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77LAPACK
-
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-env.Append(CPPPATH = [get_numpy_include_dirs(), env['F2PYINCLUDEDIR']])
-#if os.name == 'nt':
-#    # NT needs the pythonlib to run any code importing Python.h, including
-#    # simple code using only typedef and so on, so we need it for configuration
-#    # checks
-#    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
-
-#-----------------
-# Checking Lapack
-#-----------------
-st = config.CheckLAPACK()
-if not st:
-    raise RuntimeError("no lapack found, necessary for isolve module")
-
-config.Finish()
-write_info(env)
-
-#--------------------
-# iterative methods
-#--------------------
-methods = ['BiCGREVCOM.f.src',
-           'BiCGSTABREVCOM.f.src',
-           'CGREVCOM.f.src',
-           'CGSREVCOM.f.src',
-#               'ChebyREVCOM.f.src',
-           'GMRESREVCOM.f.src',
-#               'JacobiREVCOM.f.src',
-           'QMRREVCOM.f.src',
-#               'SORREVCOM.f.src'
-           ]
-Util = ['STOPTEST2.f.src','getbreak.f.src']
-raw_sources = methods + Util + ['_iterative.pyf.src']
-
-sources = []
-for method in raw_sources:
-    target = splitext(method)[0]
-    res = env.NumpyFromFTemplate(target, pjoin('iterative', method))
-    sources.append(res[0])
-
-env.NumpyPythonExtension('_iterative', source = sources)

Copied: trunk/scipy/sparse/sparsetools/SConscript (from rev 4426, trunk/scipy/sparse/sparsetools/SConstruct)

Deleted: trunk/scipy/sparse/sparsetools/SConstruct
===================================================================
--- trunk/scipy/sparse/sparsetools/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/sparse/sparsetools/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,12 +0,0 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
-# vim:syntax=python
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-
-for fmt in ['csr','csc','coo','bsr','dia']:
-    sources = [ fmt + '_wrap.cxx' ]
-    env.NumpyPythonExtension('_%s' % fmt, source = sources)

Copied: trunk/scipy/special/SConscript (from rev 4426, trunk/scipy/special/SConstruct)

Deleted: trunk/scipy/special/SConstruct
===================================================================
--- trunk/scipy/special/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/special/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,65 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin, basename as pbasename
-import sys
-
-from distutils.sysconfig import get_python_inc
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77Clib
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.Tool('numpyf2py')
-
-env.AppendUnique(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
-if sys.platform=='win32':
-#        define_macros.append(('NOINFINITIES',None))
-#        define_macros.append(('NONANS',None))
-    env.AppendUnique(CPPDEFINES = '_USE_MATH_DEFINES')
-
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
-if not config.CheckF77Clib():
-    raise RuntimeError("Could not get C/F77 runtime information")
-config.Finish()
-
-def build_lib(name, ext, libname = None):
-    """ext should be .f or .c"""
-    if not libname:
-        libname = name
-    src = env.NumpyGlob(pjoin(name, '*%s' % ext))
-    assert len(src) > 0
-    env.NumpyStaticExtLibrary(libname, source = src)
-
-# C libraries
-build_lib('c_misc', '.c')
-build_lib('cephes', '.c')
-
-# F libraries
-# XXX: handle no opt flags for mach
-build_lib('mach', '.f')
-build_lib('toms', '.f')
-build_lib('amos', '.f')
-build_lib('cdflib', '.f', 'cdf')
-build_lib('specfun', '.f', 'specfunlib')
-
-env.AppendUnique(LIBPATH = [env['build_dir']])
-
-# Cephes extension
-src = ['_cephesmodule.c', 'amos_wrappers.c', 'specfun_wrappers.c', \
-       'toms_wrappers.c','cdf_wrappers.c','ufunc_extras.c']
-
-env.NumpyPythonExtension('_cephes', 
-                         source = src, 
-                         LIBS = ['amos', 'toms', 'c_misc', 'cephes', 'mach',\
-                                 'cdf', 'specfunlib'], 
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# Specfun extension
-env.Prepend(LIBS = ['specfunlib'])
-env.NumpyPythonExtension('specfun', source = 'specfun.pyf',
-                         F2PYOPTIONS = ["--no-wrap-functions"],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])

Copied: trunk/scipy/stats/SConscript (from rev 4426, trunk/scipy/stats/SConstruct)

Deleted: trunk/scipy/stats/SConstruct
===================================================================
--- trunk/scipy/stats/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/stats/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,39 +0,0 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment, CheckF77Clib
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-t = env.Tool('numpyf2py')
-
-env.AppendUnique(CPPPATH = [get_numpy_include_dirs()])
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
-if not config.CheckF77Clib():
-    raise RuntimeError("Could not get C/F77 runtime information")
-config.Finish()
-
-# Statlib library
-src = env.NumpyGlob(pjoin('statlib', '*.f' ))
-env.NumpyStaticExtLibrary('statlibimp', source = src)
-
-env.AppendUnique(LIBPATH = [env['build_dir']])
-
-# Statlib extension
-env.NumpyPythonExtension('statlib', source = 'statlib.pyf', 
-                         F2PYOPTIONS = ["--no-wrap-functions"],
-                         LIBS = 'statlibimp',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# futil extension
-futil_src = env.NumpyF2py(pjoin('futilmodule.c'), pjoin('futil.f'))
-env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
-
-# mvn extension
-env.NumpyPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])

Copied: trunk/scipy/stsci/convolve/SConscript (from rev 4426, trunk/scipy/stsci/convolve/SConstruct)

Deleted: trunk/scipy/stsci/convolve/SConstruct
===================================================================
--- trunk/scipy/stsci/convolve/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/stsci/convolve/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,13 +0,0 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numpy import get_numarray_include
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = [get_numpy_include_dirs(), get_numarray_include()])
-env.AppendUnique(CPPDEFINES = {'NUMPY': '1'})
-
-# _correlate extension
-env.NumpyPythonExtension('_correlate', source = 'src/_correlatemodule.c') 
-env.NumpyPythonExtension('_lineshape', source = 'src/_lineshapemodule.c') 

Copied: trunk/scipy/stsci/image/SConscript (from rev 4426, trunk/scipy/stsci/image/SConstruct)

Deleted: trunk/scipy/stsci/image/SConstruct
===================================================================
--- trunk/scipy/stsci/image/SConstruct	2008-06-11 15:38:20 UTC (rev 4426)
+++ trunk/scipy/stsci/image/SConstruct	2008-06-12 10:07:55 UTC (rev 4427)
@@ -1,11 +0,0 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numpy import get_numarray_include
-from numscons import GetNumpyEnvironment
-
-env = GetNumpyEnvironment(ARGUMENTS)
-
-env.AppendUnique(CPPPATH = [get_numpy_include_dirs(), get_numarray_include()])
-env.AppendUnique(CPPDEFINES = {'NUMPY': '1'})
-
-env.NumpyPythonExtension('_combine', source = 'src/_combinemodule.c') 



More information about the Scipy-svn mailing list