[Scipy-svn] r3971 - in branches/build_with_scons/scipy: . integrate

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-05 00:17:13 -0600 (Wed, 05 Mar 2008)
New Revision: 3971

Added:
   branches/build_with_scons/scipy/integrate/SConstruct
   branches/build_with_scons/scipy/integrate/setupscons.py
Modified:
   branches/build_with_scons/scipy/setupscons.py
Log:
integrate now builds with scons.

Added: branches/build_with_scons/scipy/integrate/SConstruct
===================================================================
--- branches/build_with_scons/scipy/integrate/SConstruct	2008-03-05 06:08:51 UTC (rev 3970)
+++ branches/build_with_scons/scipy/integrate/SConstruct	2008-03-05 06:17:13 UTC (rev 3971)
@@ -0,0 +1,60 @@
+# Last Change: Wed Mar 05 03:00 PM 2008 J
+# vim:syntax=python
+from os.path import join as pjoin
+import warnings
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77BLAS
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+# Configuration
+config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib,
+                                            'CheckF77BLAS' : CheckF77BLAS})
+
+if not config.CheckF77Clib():
+    raise Exception("Could not check F77 runtime, needed for interpolate")
+if not config.CheckF77BLAS():
+    warnings.warn("Could not find F77 BLAS")
+
+config.Finish()
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+
+# XXX: lapack integration
+
+# Build linpack_lite
+src = [str(s) for s in env.Glob(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'))]
+mach = env.NumpyStaticExtLibrary('mach', source = src)
+
+# Build quadpack
+src = [str(s) for s in env.Glob(pjoin('quadpack', '*.f'))]
+quadpack = env.NumpyStaticExtLibrary('quadpack', source = src)
+
+# Build odepack
+src = [str(s) for s in env.Glob(pjoin('odepack', '*.f'))]
+odepack = env.NumpyStaticExtLibrary('odepack', source = src)
+
+#env.AppendUnique(LIBS = ['linpack_lite', 'quadpack', 'odepack', 'mach'])
+env.AppendUnique(LIBPATH = env['build_dir'])
+
+# Build _quadpack
+env.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c', 
+                         LIBS = ['quadpack', 'linpack_lite', 'mach'],
+                         LINKFLAGSEND = env['F77_LDFLAGS'])
+
+# Build _odepack
+env.NumpyPythonExtension('_odepack', source = '_odepackmodule.c',
+                         LIBS = ['odepack', 'linpack_lite', 'mach'],
+                         LINKFLAGSEND = env['F77_LDFLAGS'])
+
+# Build vode
+env.NumpyPythonExtension('vode', source = 'vode.pyf',
+                         LIBS = ['odepack', 'linpack_lite', 'mach'],
+                         LINKFLAGSEND = env['F77_LDFLAGS'])

Copied: branches/build_with_scons/scipy/integrate/setupscons.py (from rev 3969, branches/build_with_scons/scipy/integrate/setup.py)
===================================================================
--- branches/build_with_scons/scipy/integrate/setup.py	2008-03-05 02:13:58 UTC (rev 3969)
+++ branches/build_with_scons/scipy/integrate/setupscons.py	2008-03-05 06:17:13 UTC (rev 3971)
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from os.path import join
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration('integrate', parent_package, top_path)
+
+    config.add_sconscript('SConstruct')
+    config.add_data_dir('tests')
+
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())

Modified: branches/build_with_scons/scipy/setupscons.py
===================================================================
--- branches/build_with_scons/scipy/setupscons.py	2008-03-05 06:08:51 UTC (rev 3970)
+++ branches/build_with_scons/scipy/setupscons.py	2008-03-05 06:17:13 UTC (rev 3971)
@@ -4,7 +4,7 @@
     config = Configuration('scipy',parent_package,top_path, setup_name = 'setupscons.py')
     config.add_subpackage('cluster')
     config.add_subpackage('fftpack')
-    #config.add_subpackage('integrate')
+    config.add_subpackage('integrate')
     #config.add_subpackage('interpolate')
     #config.add_subpackage('io')
     #config.add_subpackage('lib')