[Scipy-svn] r3989 - in branches/build_with_scons/scipy: fftpack integrate interpolate optimize sparse/linalg/dsolve sparse/linalg/eigen/arpack

[scipy-svn at scipy.org]

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

Modified:
   branches/build_with_scons/scipy/fftpack/SConstruct
   branches/build_with_scons/scipy/integrate/SConstruct
   branches/build_with_scons/scipy/interpolate/SConstruct
   branches/build_with_scons/scipy/optimize/SConstruct
   branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct
   branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct
Log:
Replace all Glob calls by NumpyGlob to take into account build directories and src directories.

Modified: branches/build_with_scons/scipy/fftpack/SConstruct
===================================================================
--- branches/build_with_scons/scipy/fftpack/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/fftpack/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -29,7 +29,7 @@
         pass
 
 # Build dfftpack
-src = env.Glob(pjoin('dfftpack', '*.f'))
+src = env.NumpyGlob(pjoin('dfftpack', '*.f'))
 dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
 env.AppendUnique(LIBS = ['dfftpack'])
 env.AppendUnique(LIBPATH = env['build_dir'])

Modified: branches/build_with_scons/scipy/integrate/SConstruct
===================================================================
--- branches/build_with_scons/scipy/integrate/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/integrate/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -25,20 +25,20 @@
 # XXX: lapack integration
 
 # Build linpack_lite
-src = [str(s) for s in env.Glob(pjoin('linpack_lite', '*.f'))]
+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.Glob(pjoin('mach', '*.f'))]
+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.Glob(pjoin('quadpack', '*.f'))]
+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.Glob(pjoin('odepack', '*.f'))]
+src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
 odepack = env.NumpyStaticExtLibrary('odepack', source = src)
 
 #env.AppendUnique(LIBS = ['linpack_lite', 'quadpack', 'odepack', 'mach'])

Modified: branches/build_with_scons/scipy/interpolate/SConstruct
===================================================================
--- branches/build_with_scons/scipy/interpolate/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/interpolate/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -17,7 +17,7 @@
 env.AppendUnique(LINKFLAGS = env['F77_LDFLAGS'])
 
 # Build fitpack
-src = [str(s) for s in env.Glob(pjoin('fitpack', '*.f'))]
+src = [str(s) for s in env.NumpyGlob(pjoin('fitpack', '*.f'))]
 fitpack = env.NumpyStaticExtLibrary('fitpack', source = src)
 
 env.AppendUnique(LIBS = ['fitpack'])

Modified: branches/build_with_scons/scipy/optimize/SConstruct
===================================================================
--- branches/build_with_scons/scipy/optimize/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/optimize/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -47,11 +47,11 @@
 #==========
 
 # minpack lib
-minpack_src = [str(s) for s in env.Glob(pjoin('minpack', '*.f'))]
+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.Glob(pjoin('Zeros', '*.c'))]
+rootfind_src = [str(s) for s in env.NumpyGlob(pjoin('Zeros', '*.c'))]
 env.NumpyStaticExtLibrary('rootfind', source = rootfind_src)
 
 env.AppendUnique(LIBS = ['minpack', 'rootfind'])

Modified: branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct
===================================================================
--- branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -32,7 +32,7 @@
 superlu_def['USE_VENDOR_BLAS'] = 2
 superlu_env.Append(CPPDEFINES = superlu_def)
 
-superlu_src = superlu_env.Glob(pjoin('SuperLU', 'SRC', '*.c'))
+superlu_src = superlu_env.NumpyGlob(pjoin('SuperLU', 'SRC', '*.c'))
 superlu = superlu_env.NumpyStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions

Modified: branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-03-05 12:30:12 UTC (rev 3988)
+++ branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-03-05 12:33:10 UTC (rev 3989)
@@ -25,9 +25,9 @@
 write_info(env)
 
 # Build arpack
-arpack_src = env.Glob(pjoin('ARPACK', 'SRC', '*.f'))
-arpack_src += env.Glob(pjoin('ARPACK', 'UTIL', '*.f'))
-arpack_src += env.Glob(pjoin('ARPACK', 'LAPACK', '*.f'))
+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]