[Scipy-svn] r4432 - in trunk/scipy: fftpack integrate interpolate odr optimize sparse/linalg/dsolve sparse/linalg/eigen/arpack special stats

scipy-svn@scip... scipy-svn@scip...
Thu Jun 12 05:23:54 CDT 2008


Author: cdavid
Date: 2008-06-12 05:23:33 -0500 (Thu, 12 Jun 2008)
New Revision: 4432

Modified:
   trunk/scipy/fftpack/SConscript
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/odr/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/dsolve/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
Rename NumpyStaticExtLibrary to DistutilsStaticExtLibrary.

Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/fftpack/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -31,7 +31,7 @@
 
 # Build dfftpack
 src = env.NumpyGlob(pjoin('dfftpack', '*.f'))
-dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
+dfftpack = env.DistutilsStaticExtLibrary('dfftpack', source = [str(s) for s in src])
 env.PrependUnique(LIBS = ['dfftpack'])
 env.PrependUnique(LIBPATH = env['build_dir'])
 

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/integrate/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -27,20 +27,20 @@
 
 # Build linpack_lite
 src = [str(s) for s in env.NumpyGlob(pjoin('linpack_lite', '*.f'))]
-linpack_lite = env.NumpyStaticExtLibrary('linpack_lite', source = src)
+linpack_lite = env.DistutilsStaticExtLibrary('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)
+mach = env.DistutilsStaticExtLibrary('mach', source = src)
 
 # Build quadpack
 src = [str(s) for s in env.NumpyGlob(pjoin('quadpack', '*.f'))]
-quadpack = env.NumpyStaticExtLibrary('quadpack', source = src)
+quadpack = env.DistutilsStaticExtLibrary('quadpack', source = src)
 
 # Build odepack
 src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
-odepack = env.NumpyStaticExtLibrary('odepack', source = src)
+odepack = env.DistutilsStaticExtLibrary('odepack', source = src)
 
 env.AppendUnique(LIBPATH = env['build_dir'])
 env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/interpolate/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -19,7 +19,7 @@
 
 # Build fitpack
 src = [str(s) for s in env.NumpyGlob(pjoin('fitpack', '*.f'))]
-fitpack = env.NumpyStaticExtLibrary('fitpack', source = src)
+fitpack = env.DistutilsStaticExtLibrary('fitpack', source = src)
 
 env.PrependUnique(LIBS = ['fitpack'])
 env.PrependUnique(LIBPATH = [env['build_dir']])

Modified: trunk/scipy/odr/SConscript
===================================================================
--- trunk/scipy/odr/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/odr/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -52,7 +52,7 @@
 else:
     libodr_src.append(pjoin('odrpack', 'd_lpkbls.f'))
 
-env.NumpyStaticExtLibrary('odrpack', source = libodr_src)
+env.DistutilsStaticExtLibrary('odrpack', source = libodr_src)
 
 env.PrependUnique(LIBS = 'odrpack')
 env.PrependUnique(LIBPATH = env['build_dir'])

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/optimize/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -49,11 +49,11 @@
 
 # minpack lib
 minpack_src = [str(s) for s in env.NumpyGlob(pjoin('minpack', '*.f'))]
-env.NumpyStaticExtLibrary('minpack', source = minpack_src)
+env.DistutilsStaticExtLibrary('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.DistutilsStaticExtLibrary('rootfind', source = rootfind_src)
 
 env.AppendUnique(LIBS = ['minpack', 'rootfind'])
 env.AppendUnique(LIBPATH = env['build_dir'])

Modified: trunk/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -33,7 +33,7 @@
 superlu_env.Append(CPPDEFINES = superlu_def)
 
 superlu_src = superlu_env.NumpyGlob(pjoin('SuperLU', 'SRC', '*.c'))
-superlu = superlu_env.NumpyStaticExtLibrary('superlu_src', source = superlu_src)
+superlu = superlu_env.DistutilsStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions
 pyenv = env.Clone()

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -36,7 +36,7 @@
 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)
+arpack_lib = env.DistutilsStaticExtLibrary('arpack', source = src)
 
 # Build _arpack extension
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/special/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -32,7 +32,7 @@
         libname = name
     src = env.NumpyGlob(pjoin(name, '*%s' % ext))
     assert len(src) > 0
-    env.NumpyStaticExtLibrary(libname, source = src)
+    env.DistutilsStaticExtLibrary(libname, source = src)
 
 # C libraries
 build_lib('c_misc', '.c')

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
+++ trunk/scipy/stats/SConscript	2008-06-12 10:23:33 UTC (rev 4432)
@@ -19,7 +19,7 @@
 
 # Statlib library
 src = env.NumpyGlob(pjoin('statlib', '*.f' ))
-env.NumpyStaticExtLibrary('statlibimp', source = src)
+env.DistutilsStaticExtLibrary('statlibimp', source = src)
 
 env.AppendUnique(LIBPATH = [env['build_dir']])
 



More information about the Scipy-svn mailing list