[Scipy-svn] r3995 - in branches/build_with_scons/scipy: . ndimage

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-05 07:03:09 -0600 (Wed, 05 Mar 2008)
New Revision: 3995

Added:
   branches/build_with_scons/scipy/ndimage/SConstruct
   branches/build_with_scons/scipy/ndimage/setupscons.py
Modified:
   branches/build_with_scons/scipy/setupscons.py
Log:
ndimage now builds with numscons.

Added: branches/build_with_scons/scipy/ndimage/SConstruct
===================================================================
--- branches/build_with_scons/scipy/ndimage/SConstruct	2008-03-05 12:58:07 UTC (rev 3994)
+++ branches/build_with_scons/scipy/ndimage/SConstruct	2008-03-05 13:03:09 UTC (rev 3995)
@@ -0,0 +1,22 @@
+# Last Change: Wed Mar 05 09:00 PM 2008 J
+from os.path import join
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numscons import GetNumpyEnvironment
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = 'src')
+
+ndimage_src = ["nd_image.c", "ni_filters.c", "ni_fourier.c", "ni_interpolation.c",
+               "ni_measure.c", "ni_morphology.c", "ni_support.c"]
+env.NumpyPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
+
+segment_src = ['Segmenter_EXT.c', 'Segmenter_IMPL.c']
+env.NumpyPythonExtension('_segment', source = [join('src', 'segment', i) 
+                                               for i in segment_src])
+
+register_src = ['Register_EXT.c', 'Register_IMPL.c']
+env.NumpyPythonExtension('_register', source = [join('src', 'register', i) 
+                                                for i in register_src])

Copied: branches/build_with_scons/scipy/ndimage/setupscons.py (from rev 3979, branches/build_with_scons/scipy/ndimage/setup.py)
===================================================================
--- branches/build_with_scons/scipy/ndimage/setup.py	2008-03-05 08:14:54 UTC (rev 3979)
+++ branches/build_with_scons/scipy/ndimage/setupscons.py	2008-03-05 13:03:09 UTC (rev 3995)
@@ -0,0 +1,15 @@
+from numpy.distutils.core import setup
+from numpy.distutils.misc_util import Configuration
+from numpy import get_include
+
+def configuration(parent_package='', top_path=None):
+
+    config = Configuration('ndimage', parent_package, top_path)
+
+    config.add_sconscript("SConstruct")
+    config.add_data_dir('tests')
+
+    return config
+
+if __name__ == '__main__':
+    setup(**configuration(top_path='').todict())

Modified: branches/build_with_scons/scipy/setupscons.py
===================================================================
--- branches/build_with_scons/scipy/setupscons.py	2008-03-05 12:58:07 UTC (rev 3994)
+++ branches/build_with_scons/scipy/setupscons.py	2008-03-05 13:03:09 UTC (rev 3995)
@@ -20,7 +20,7 @@
     config.add_subpackage('special')
     config.add_subpackage('splinalg')
     config.add_subpackage('stats')
-    #config.add_subpackage('ndimage')
+    config.add_subpackage('ndimage')
     config.add_subpackage('stsci')
     #config.add_subpackage('weave')
     #config.add_subpackage('testing')