[Scipy-svn] r4859 - branches/refactor_fft/scipy/fftpack/fftpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-10-28 00:18:00 -0500 (Tue, 28 Oct 2008)
New Revision: 4859

Added:
   branches/refactor_fft/scipy/fftpack/fftpack/SConscript
Removed:
   branches/refactor_fft/scipy/fftpack/fftpack/SConstruct
Log:
Update fftpack backend numscons build.

Copied: branches/refactor_fft/scipy/fftpack/fftpack/SConscript (from rev 4845, branches/refactor_fft/scipy/fftpack/fftpack/SConstruct)
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/SConstruct	2008-10-26 09:20:24 UTC (rev 4845)
+++ branches/refactor_fft/scipy/fftpack/fftpack/SConscript	2008-10-28 05:18:00 UTC (rev 4859)
@@ -0,0 +1,34 @@
+# Last Change: Tue Oct 28 02:00 PM 2008 J
+# vim:syntax=python
+from os.path import join as pjoin
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numscons import GetNumpyEnvironment
+from numscons import CheckF77Clib
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+env.AppendUnique(CPPPATH = [pjoin(env['build_dir'], "src")])
+
+config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
+if not config.CheckF77Clib():
+    raise Exception("Could not get f77/c++ link information")
+config.Finish()
+
+# Build dfftpack
+src = env.NumpyGlob(pjoin('DFFTPACK', '*.f'))
+dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
+env.PrependUnique(LIBS = ['dfftpack'])
+env.PrependUnique(LIBPATH = env['build_dir'])
+
+# Build the fftpack wrapper
+src = [pjoin("src/fftpack", i) for i in ['zfft.cxx','drfft.cxx', 'zfftnd.cxx']]
+src.append(env.NumpyFromFTemplate('fftpack.pyf', 'fftpack.pyf.src'))
+env.NumpyPythonExtension('_fftpack', src + ['src/zrfft.c'])
+
+# Build convolve
+src = ['src/fftpack/convolve.cxx',  'convolve.pyf']
+env.NumpyPythonExtension('convolve', src)

Deleted: branches/refactor_fft/scipy/fftpack/fftpack/SConstruct
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/SConstruct	2008-10-28 05:11:07 UTC (rev 4858)
+++ branches/refactor_fft/scipy/fftpack/fftpack/SConstruct	2008-10-28 05:18:00 UTC (rev 4859)
@@ -1,34 +0,0 @@
-# Last Change: Sun May 18 06:00 PM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment
-from numscons import CheckF77Clib
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(CPPPATH = [pjoin(env['build_dir'], "src")])
-
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
-if not config.CheckF77Clib():
-    raise Exception("Could not get f77/c++ link information")
-config.Finish()
-
-# Build dfftpack
-src = env.NumpyGlob(pjoin('DFFTPACK', '*.f'))
-dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
-env.PrependUnique(LIBS = ['dfftpack'])
-env.PrependUnique(LIBPATH = env['build_dir'])
-
-# Build the fftpack wrapper
-src = [pjoin("src/fftpack", i) for i in ['zfft.cxx','drfft.cxx', 'zfftnd.cxx']]
-src.append(env.NumpyFromFTemplate('fftpack.pyf', 'fftpack.pyf.src'))
-env.NumpyPythonExtension('_fftpack', src + ['src/zrfft.c'])
-
-# Build convolve
-src = ['src/fftpack/convolve.cxx',  'convolve.pyf']
-env.NumpyPythonExtension('convolve', src)