[Scipy-svn] r3596 - branches/scipy.scons/scipy/stats

scipy-svn@scip... scipy-svn@scip...
Mon Nov 26 00:24:57 CST 2007


Author: cdavid
Date: 2007-11-26 00:24:52 -0600 (Mon, 26 Nov 2007)
New Revision: 3596

Modified:
   branches/scipy.scons/scipy/stats/SConstruct
   branches/scipy.scons/scipy/stats/setupscons.py
Log:
add forgotten mvn extension in scipy.stats

Modified: branches/scipy.scons/scipy/stats/SConstruct
===================================================================
--- branches/scipy.scons/scipy/stats/SConstruct	2007-11-26 05:33:22 UTC (rev 3595)
+++ branches/scipy.scons/scipy/stats/SConstruct	2007-11-26 06:24:52 UTC (rev 3596)
@@ -1,4 +1,4 @@
-# Last Change: Mon Nov 26 02: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
@@ -20,9 +20,8 @@
 config.Finish()
 
 # Statlib library
-src = glob.glob(pjoin(env['src_dir'], 'statlib', '*.f' ))
-env.NumpyStaticExtLibrary('statlib', 
-                          source = [pjoin('statlib', pbasename(i)) for i in src])
+src = env.NumpyGlob(pjoin('statlib', '*.f' ))
+env.NumpyStaticExtLibrary('statlib', source = src)
 
 env.AppendUnique(LIBPATH = env['build_dir'])
 
@@ -37,3 +36,7 @@
                      pjoin(env['build_dir'], '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'])

Modified: branches/scipy.scons/scipy/stats/setupscons.py
===================================================================
--- branches/scipy.scons/scipy/stats/setupscons.py	2007-11-26 05:33:22 UTC (rev 3595)
+++ branches/scipy.scons/scipy/stats/setupscons.py	2007-11-26 06:24:52 UTC (rev 3596)
@@ -4,9 +4,10 @@
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('stats', parent_package, top_path, setup_name = 'setupscons.py')
+    config = Configuration('stats', parent_package, top_path, 
+                           setup_name = 'setupscons.py')
 
-    #config.add_subpackage('models')
+    config.add_subpackage('models')
     config.add_data_dir('tests')
 
     config.add_sconscript('SConstruct')



More information about the Scipy-svn mailing list