[Scipy-svn] r3598 - in branches/scipy.scons/scipy: fftpack integrate interpolate linsolve optimize special stats
scipy-svn at scipy.org
scipy-svn at scipy.org
Mon Nov 26 02:02:31 EST 2007
Author: cdavid
Date: 2007-11-26 01:02:19 -0600 (Mon, 26 Nov 2007)
New Revision: 3598
Modified:
branches/scipy.scons/scipy/fftpack/SConstruct
branches/scipy.scons/scipy/integrate/SConstruct
branches/scipy.scons/scipy/interpolate/SConstruct
branches/scipy.scons/scipy/linsolve/SConstruct
branches/scipy.scons/scipy/optimize/SConstruct
branches/scipy.scons/scipy/special/SConstruct
branches/scipy.scons/scipy/stats/SConstruct
Log:
Remove any glob use in sconscript, replace with NumpyGlob
Modified: branches/scipy.scons/scipy/fftpack/SConstruct
===================================================================
--- branches/scipy.scons/scipy/fftpack/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/fftpack/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,8 +1,8 @@
# Last Change: Mon Nov 26 03:00 PM 2007 J
# vim:syntax=python
from os.path import join as pjoin
-import glob
+
from numpy.distutils.misc_util import get_numpy_include_dirs
from numpy.distutils.scons import GetNumpyEnvironment
Modified: branches/scipy.scons/scipy/integrate/SConstruct
===================================================================
--- branches/scipy.scons/scipy/integrate/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/integrate/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,8 +1,8 @@
# Last Change: Thu Nov 22 12:00 PM 2007 J
# vim:syntax=python
from os.path import join as pjoin
-import glob
+
from numpy.distutils.misc_util import get_numpy_include_dirs
from numpy.distutils.scons import GetNumpyEnvironment
@@ -14,19 +14,19 @@
# XXX: blas/lapack integration
# Build linpack_lite
-src = glob.glob(pjoin('linpack_lite', '*.f'))
+src = env.NumpyGlob(pjoin('linpack_lite', '*.f'))
linpack_lite = env.NumpyStaticExtLibrary('linpack_lite', source = src)
# Build mach
-src = glob.glob(pjoin('mach', '*.f'))
+src = env.NumpyGlob(pjoin('mach', '*.f'))
mach = env.NumpyStaticExtLibrary('mach', source = src)
# Build quadpack
-src = glob.glob(pjoin('quadpack', '*.f'))
+src = env.NumpyGlob(pjoin('quadpack', '*.f'))
quadpack = env.NumpyStaticExtLibrary('quadpack', source = src)
# Build odepack
-src = glob.glob(pjoin('odepack', '*.f'))
+src = env.NumpyGlob(pjoin('odepack', '*.f'))
odepack = env.NumpyStaticExtLibrary('odepack', source = src)
env.AppendUnique(LIBS = ['linpack_lite', 'quadpack', 'odepack'])
Modified: branches/scipy.scons/scipy/interpolate/SConstruct
===================================================================
--- branches/scipy.scons/scipy/interpolate/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/interpolate/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,8 +1,8 @@
# Last Change: Thu Nov 22 12:00 PM 2007 J
# vim:syntax=python
from os.path import join as pjoin
-import glob
+
from numpy.distutils.misc_util import get_numpy_include_dirs
from numpy.distutils.scons import GetNumpyEnvironment, CheckF77Clib
@@ -18,7 +18,7 @@
env.AppendUnique(LINKFLAGS = env['F77_LDFLAGS'])
# Build fitpack
-src = glob.glob(pjoin('fitpack', '*.f'))
+src = env.NumpyGlob(pjoin('fitpack', '*.f'))
fitpack = env.NumpyStaticExtLibrary('fitpack', source = src)
env.AppendUnique(LIBS = ['fitpack'])
Modified: branches/scipy.scons/scipy/linsolve/SConstruct
===================================================================
--- branches/scipy.scons/scipy/linsolve/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/linsolve/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,7 +1,7 @@
# Last Change: Sat Nov 24 05:00 PM 2007 J
# vim:syntax=python
from os.path import join as pjoin
-import glob
+
import sys
from distutils.sysconfig import get_python_inc
@@ -21,7 +21,7 @@
superlu_defs = []
# Build superlu
-src = glob.glob(pjoin('SuperLU', 'SRC', '*.c'))
+src = env.NumpyGlob(pjoin('SuperLU', 'SRC', '*.c'))
superlu = env.NumpyStaticExtLibrary('superlu_src', source = src,
CPPDEFINES = superlu_defs)
Modified: branches/scipy.scons/scipy/optimize/SConstruct
===================================================================
--- branches/scipy.scons/scipy/optimize/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/optimize/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,10 +1,10 @@
-# Last Change: Sat Nov 24 07:00 PM 2007 J
+# Last Change: Mon Nov 26 03:00 PM 2007 J
# vim:syntax=python
import os
from os.path import join as pjoin, splitext
-import glob
+
from numpy.distutils.misc_util import get_numpy_include_dirs
from numpy.distutils.scons import get_python_inc#, get_pythonlib_dir
from numpy.distutils.scons import GetNumpyEnvironment
@@ -43,11 +43,11 @@
#==========
# minpack lib
-minpack_src = glob.glob(pjoin('minpack', '*.f'))
+minpack_src = env.NumpyGlob(pjoin('minpack', '*.f'))
env.NumpyStaticExtLibrary('minpack', source = minpack_src)
# rootfind lib
-rootfind_src = glob.glob(pjoin('Zeros', '*.c'))
+rootfind_src = env.NumpyGlob(pjoin('Zeros', '*.c'))
env.NumpyStaticExtLibrary('rootfind', source = rootfind_src)
env.AppendUnique(LIBS = ['minpack', 'rootfind'])
Modified: branches/scipy.scons/scipy/special/SConstruct
===================================================================
--- branches/scipy.scons/scipy/special/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/special/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -1,8 +1,8 @@
-# Last Change: Sat Nov 24 08:00 PM 2007 J
+# Last Change: Mon Nov 26 03:00 PM 2007 J
# vim:syntax=python
from os.path import join as pjoin, basename as pbasename
import sys
-import glob
+
from distutils.sysconfig import get_python_inc
from numpy.distutils.misc_util import get_numpy_include_dirs
@@ -28,12 +28,8 @@
"""ext should be .f or .c"""
if not libname:
libname = name
- src = glob.glob(pjoin(env['src_dir'], name, '*%s' % ext))
- assert len(src) > 0
- env.NumpyStaticExtLibrary(libname,
- source = [pjoin(name,
- pbasename(i))
- for i in src])
+ src = env.NumpyGlob(pjoin(name, '*%s' % ext))
+ env.NumpyStaticExtLibrary(libname, source = src)
# C libraries
build_lib('c_misc', '.c')
Modified: branches/scipy.scons/scipy/stats/SConstruct
===================================================================
--- branches/scipy.scons/scipy/stats/SConstruct 2007-11-26 06:55:26 UTC (rev 3597)
+++ branches/scipy.scons/scipy/stats/SConstruct 2007-11-26 07:02:19 UTC (rev 3598)
@@ -2,7 +2,7 @@
# vim:syntax=python
from os.path import join as pjoin, basename as pbasename
import sys
-import glob
+
from distutils.sysconfig import get_python_inc
from numpy.distutils.misc_util import get_numpy_include_dirs
More information about the Scipy-svn
mailing list