[Scipy-svn] r3564 - in branches/scipy.scons/scipy/ndimage: . segment segment/tests src tests

scipy-svn at scipy.org scipy-svn at scipy.org
Wed Nov 21 21:45:34 EST 2007


Author: cdavid
Date: 2007-11-21 20:45:18 -0600 (Wed, 21 Nov 2007)
New Revision: 3564

Added:
   branches/scipy.scons/scipy/ndimage/SConstruct
   branches/scipy.scons/scipy/ndimage/segment/SConstruct
   branches/scipy.scons/scipy/ndimage/segment/setupscons.py
   branches/scipy.scons/scipy/ndimage/setupscons.py
Modified:
   branches/scipy.scons/scipy/ndimage/
   branches/scipy.scons/scipy/ndimage/segment/
   branches/scipy.scons/scipy/ndimage/segment/tests/
   branches/scipy.scons/scipy/ndimage/src/
   branches/scipy.scons/scipy/ndimage/tests/
Log:
ndimage now builds with scons


Property changes on: branches/scipy.scons/scipy/ndimage
___________________________________________________________________
Name: svn:ignore
   - *.pyc
*.swp
*.pyd
*.so

   + *.pyc
*.swp
*.pyd
*.so



Added: branches/scipy.scons/scipy/ndimage/SConstruct
===================================================================
--- branches/scipy.scons/scipy/ndimage/SConstruct	2007-11-21 16:09:31 UTC (rev 3563)
+++ branches/scipy.scons/scipy/ndimage/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
@@ -0,0 +1,16 @@
+# Last Change: Thu Oct 18 09:00 PM 2007 J
+# vim:syntax=python
+from os.path import join
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = 'src')
+
+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 src])


Property changes on: branches/scipy.scons/scipy/ndimage/segment
___________________________________________________________________
Name: svn:ignore
   + *.pyc
*.swp
*.pyd
*.so



Added: branches/scipy.scons/scipy/ndimage/segment/SConstruct
===================================================================
--- branches/scipy.scons/scipy/ndimage/segment/SConstruct	2007-11-21 16:09:31 UTC (rev 3563)
+++ branches/scipy.scons/scipy/ndimage/segment/SConstruct	2007-11-22 02:45:18 UTC (rev 3564)
@@ -0,0 +1,14 @@
+# Last Change: Thu Oct 18 09:00 PM 2007 J
+# vim:syntax=python
+from os.path import join
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = 'src')
+
+src = ["Segmenter_EXT.c", "Segmenter_IMPL.c"]
+env.NumpyPythonExtension('_segmenter', source = src)

Copied: branches/scipy.scons/scipy/ndimage/segment/setupscons.py (from rev 3562, branches/scipy.scons/scipy/ndimage/segment/setup.py)
===================================================================
--- branches/scipy.scons/scipy/ndimage/segment/setup.py	2007-11-21 16:04:03 UTC (rev 3562)
+++ branches/scipy.scons/scipy/ndimage/segment/setupscons.py	2007-11-22 02:45:18 UTC (rev 3564)
@@ -0,0 +1,19 @@
+
+#!/usr/bin/env python
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration('segment', 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())
+
+


Property changes on: branches/scipy.scons/scipy/ndimage/segment/tests
___________________________________________________________________
Name: svn:ignore
   + *.pyc
*.swp
*.pyd
*.so



Copied: branches/scipy.scons/scipy/ndimage/setupscons.py (from rev 3562, branches/scipy.scons/scipy/ndimage/setup.py)
===================================================================
--- branches/scipy.scons/scipy/ndimage/setup.py	2007-11-21 16:04:03 UTC (rev 3562)
+++ branches/scipy.scons/scipy/ndimage/setupscons.py	2007-11-22 02:45:18 UTC (rev 3564)
@@ -0,0 +1,17 @@
+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, 
+                           setup_name = 'setupscons.py')
+
+    config.add_sconscript('SConstruct')
+    config.add_subpackage('segment')
+    config.add_data_dir('tests')
+
+    return config
+
+if __name__ == '__main__':
+    setup(**configuration(top_path='').todict())


Property changes on: branches/scipy.scons/scipy/ndimage/src
___________________________________________________________________
Name: svn:ignore
   - *.pyc
*.swp
*.pyd
*.so

   + *.pyc
*.swp
*.pyd
*.so




Property changes on: branches/scipy.scons/scipy/ndimage/tests
___________________________________________________________________
Name: svn:ignore
   - *.pyc
*.swp
*.pyd
*.so

   + *.pyc
*.swp
*.pyd
*.so






More information about the Scipy-svn mailing list