[Scipy-svn] r4022 - in trunk/scipy: . fftpack integrate interpolate maxentropy misc ndimage odr optimize sandbox signal sparse sparse/linalg sparse/linalg/dsolve sparse/linalg/dsolve/umfpack sparse/linalg/eigen sparse/linalg/eigen/arpack sparse/linalg/isolve special stats stats/models stsci stsci/convolve stsci/image testing weave

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-15 05:38:18 -0500 (Sat, 15 Mar 2008)
New Revision: 4022

Added:
   trunk/scipy/maxentropy/setupscons.py
   trunk/scipy/misc/setupscons.py
   trunk/scipy/ndimage/SConstruct
   trunk/scipy/ndimage/setupscons.py
   trunk/scipy/odr/SConstruct
   trunk/scipy/odr/setupscons.py
   trunk/scipy/optimize/SConstruct
   trunk/scipy/optimize/setupscons.py
   trunk/scipy/sandbox/setupscons.py
   trunk/scipy/signal/SConstruct
   trunk/scipy/signal/setupscons.py
   trunk/scipy/sparse/SConstruct
   trunk/scipy/sparse/linalg/dsolve/SConstruct
   trunk/scipy/sparse/linalg/dsolve/setupscons.py
   trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct
   trunk/scipy/sparse/linalg/dsolve/umfpack/setupscons.py
   trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
   trunk/scipy/sparse/linalg/eigen/arpack/setupscons.py
   trunk/scipy/sparse/linalg/eigen/setupscons.py
   trunk/scipy/sparse/linalg/isolve/SConstruct
   trunk/scipy/sparse/linalg/isolve/setupscons.py
   trunk/scipy/sparse/linalg/setupscons.py
   trunk/scipy/sparse/setupscons.py
   trunk/scipy/special/SConstruct
   trunk/scipy/special/setupscons.py
   trunk/scipy/stats/SConstruct
   trunk/scipy/stats/models/setupscons.py
   trunk/scipy/stats/setupscons.py
   trunk/scipy/stsci/convolve/SConstruct
   trunk/scipy/stsci/convolve/setupscons.py
   trunk/scipy/stsci/image/SConstruct
   trunk/scipy/stsci/image/setupscons.py
   trunk/scipy/stsci/setupscons.py
   trunk/scipy/testing/setupscons.py
   trunk/scipy/weave/setupscons.py
Modified:
   trunk/scipy/fftpack/SConstruct
   trunk/scipy/integrate/SConstruct
   trunk/scipy/interpolate/SConstruct
   trunk/scipy/setupscons.py
Log:
Merge revisions 3976:3998 from build_with_scons branch

Modified: trunk/scipy/fftpack/SConstruct
===================================================================
--- trunk/scipy/fftpack/SConstruct	2008-03-15 10:32:03 UTC (rev 4021)
+++ trunk/scipy/fftpack/SConstruct	2008-03-15 10:38:18 UTC (rev 4022)
@@ -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: trunk/scipy/integrate/SConstruct
===================================================================
--- trunk/scipy/integrate/SConstruct	2008-03-15 10:32:03 UTC (rev 4021)
+++ trunk/scipy/integrate/SConstruct	2008-03-15 10:38:18 UTC (rev 4022)
@@ -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: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct	2008-03-15 10:32:03 UTC (rev 4021)
+++ trunk/scipy/interpolate/SConstruct	2008-03-15 10:38:18 UTC (rev 4022)
@@ -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'])

Copied: trunk/scipy/maxentropy/setupscons.py (from rev 3998, branches/build_with_scons/scipy/maxentropy/setupscons.py)

Copied: trunk/scipy/misc/setupscons.py (from rev 3998, branches/build_with_scons/scipy/misc/setupscons.py)

Copied: trunk/scipy/ndimage/SConstruct (from rev 3998, branches/build_with_scons/scipy/ndimage/SConstruct)

Copied: trunk/scipy/ndimage/setupscons.py (from rev 3998, branches/build_with_scons/scipy/ndimage/setupscons.py)

Copied: trunk/scipy/odr/SConstruct (from rev 3998, branches/build_with_scons/scipy/odr/SConstruct)

Copied: trunk/scipy/odr/setupscons.py (from rev 3998, branches/build_with_scons/scipy/odr/setupscons.py)

Copied: trunk/scipy/optimize/SConstruct (from rev 3998, branches/build_with_scons/scipy/optimize/SConstruct)

Copied: trunk/scipy/optimize/setupscons.py (from rev 3998, branches/build_with_scons/scipy/optimize/setupscons.py)

Copied: trunk/scipy/sandbox/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sandbox/setupscons.py)

Modified: trunk/scipy/setupscons.py
===================================================================
--- trunk/scipy/setupscons.py	2008-03-15 10:32:03 UTC (rev 4021)
+++ trunk/scipy/setupscons.py	2008-03-15 10:38:18 UTC (rev 4022)
@@ -9,21 +9,21 @@
     config.add_subpackage('io')
     config.add_subpackage('lib')
     config.add_subpackage('linalg')
-    #config.add_subpackage('linsolve')
-    #config.add_subpackage('maxentropy')
-    #config.add_subpackage('misc')
-    #config.add_subpackage('odr')
-    #config.add_subpackage('optimize')
-    #config.add_subpackage('sandbox')
-    #config.add_subpackage('signal')
-    #config.add_subpackage('sparse')
-    #config.add_subpackage('special')
-    #config.add_subpackage('splinalg')
-    #config.add_subpackage('stats')
-    #config.add_subpackage('ndimage')
-    #config.add_subpackage('stsci')
-    #config.add_subpackage('weave')
-    #config.add_subpackage('testing')
+    config.add_subpackage('linsolve')
+    config.add_subpackage('maxentropy')
+    config.add_subpackage('misc')
+    config.add_subpackage('odr')
+    config.add_subpackage('optimize')
+    config.add_subpackage('sandbox')
+    config.add_subpackage('signal')
+    config.add_subpackage('sparse')
+    config.add_subpackage('special')
+    config.add_subpackage('splinalg')
+    config.add_subpackage('stats')
+    config.add_subpackage('ndimage')
+    config.add_subpackage('stsci')
+    config.add_subpackage('weave')
+    config.add_subpackage('testing')
     config.make_svn_version_py()  # installs __svn_version__.py
     config.scons_make_config_py() # installs __config__.py
     return config

Copied: trunk/scipy/signal/SConstruct (from rev 3998, branches/build_with_scons/scipy/signal/SConstruct)

Copied: trunk/scipy/signal/setupscons.py (from rev 3998, branches/build_with_scons/scipy/signal/setupscons.py)

Copied: trunk/scipy/sparse/SConstruct (from rev 3998, branches/build_with_scons/scipy/sparse/SConstruct)

Copied: trunk/scipy/sparse/linalg/dsolve/SConstruct (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/dsolve/SConstruct)

Copied: trunk/scipy/sparse/linalg/dsolve/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/dsolve/setupscons.py)

Copied: trunk/scipy/sparse/linalg/dsolve/umfpack/SConstruct (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/dsolve/umfpack/SConstruct)

Copied: trunk/scipy/sparse/linalg/dsolve/umfpack/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/dsolve/umfpack/setupscons.py)

Copied: trunk/scipy/sparse/linalg/eigen/arpack/SConstruct (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct)

Copied: trunk/scipy/sparse/linalg/eigen/arpack/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/setupscons.py)

Copied: trunk/scipy/sparse/linalg/eigen/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/eigen/setupscons.py)

Copied: trunk/scipy/sparse/linalg/isolve/SConstruct (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/isolve/SConstruct)

Copied: trunk/scipy/sparse/linalg/isolve/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/isolve/setupscons.py)

Copied: trunk/scipy/sparse/linalg/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/linalg/setupscons.py)

Copied: trunk/scipy/sparse/setupscons.py (from rev 3998, branches/build_with_scons/scipy/sparse/setupscons.py)

Copied: trunk/scipy/special/SConstruct (from rev 3998, branches/build_with_scons/scipy/special/SConstruct)

Copied: trunk/scipy/special/setupscons.py (from rev 3998, branches/build_with_scons/scipy/special/setupscons.py)

Copied: trunk/scipy/stats/SConstruct (from rev 3998, branches/build_with_scons/scipy/stats/SConstruct)

Copied: trunk/scipy/stats/models/setupscons.py (from rev 3998, branches/build_with_scons/scipy/stats/models/setupscons.py)

Copied: trunk/scipy/stats/setupscons.py (from rev 3998, branches/build_with_scons/scipy/stats/setupscons.py)

Copied: trunk/scipy/stsci/convolve/SConstruct (from rev 3998, branches/build_with_scons/scipy/stsci/convolve/SConstruct)

Copied: trunk/scipy/stsci/convolve/setupscons.py (from rev 3998, branches/build_with_scons/scipy/stsci/convolve/setupscons.py)

Copied: trunk/scipy/stsci/image/SConstruct (from rev 3998, branches/build_with_scons/scipy/stsci/image/SConstruct)

Copied: trunk/scipy/stsci/image/setupscons.py (from rev 3998, branches/build_with_scons/scipy/stsci/image/setupscons.py)

Copied: trunk/scipy/stsci/setupscons.py (from rev 3998, branches/build_with_scons/scipy/stsci/setupscons.py)

Copied: trunk/scipy/testing/setupscons.py (from rev 3998, branches/build_with_scons/scipy/testing/setupscons.py)

Copied: trunk/scipy/weave/setupscons.py (from rev 3998, branches/build_with_scons/scipy/weave/setupscons.py)