[Scipy-svn] r4044 - in trunk/scipy/sparse: . sparsetools

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-20 09:28:56 -0500 (Thu, 20 Mar 2008)
New Revision: 4044

Removed:
   trunk/scipy/sparse/SConstruct
Modified:
   trunk/scipy/sparse/setupscons.py
   trunk/scipy/sparse/sparsetools/setupscons.py
Log:
Update scons build scripts for sparsetools and top sparse.

Deleted: trunk/scipy/sparse/SConstruct
===================================================================
--- trunk/scipy/sparse/SConstruct	2008-03-19 23:41:04 UTC (rev 4043)
+++ trunk/scipy/sparse/SConstruct	2008-03-20 14:28:56 UTC (rev 4044)
@@ -1,18 +0,0 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
-# vim:syntax=python
-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.NumpyPythonExtension('_sparsetools', 
-                         source = [join('sparsetools', 'sparsetools_wrap.cxx')])
-
-# Copy this python file into the distutils lib dir
-env.Command(join(env['distutils_installdir'], 'sparsetools.py'),
-            join(env['src_dir'], 'sparsetools', 'sparsetools.py'),
-            Copy('$TARGET', '$SOURCE'))

Modified: trunk/scipy/sparse/setupscons.py
===================================================================
--- trunk/scipy/sparse/setupscons.py	2008-03-19 23:41:04 UTC (rev 4043)
+++ trunk/scipy/sparse/setupscons.py	2008-03-20 14:28:56 UTC (rev 4044)
@@ -11,8 +11,8 @@
                            setup_name = 'setupscons.py')
 
     config.add_data_dir('tests')
-    config.add_sconscript('SConstruct')
     config.add_subpackage('linalg')
+    config.add_subpackage('sparsetools')
 
     return config
 

Modified: trunk/scipy/sparse/sparsetools/setupscons.py
===================================================================
--- trunk/scipy/sparse/sparsetools/setupscons.py	2008-03-19 23:41:04 UTC (rev 4043)
+++ trunk/scipy/sparse/sparsetools/setupscons.py	2008-03-20 14:28:56 UTC (rev 4044)
@@ -7,7 +7,7 @@
     import numpy
     from numpy.distutils.misc_util import Configuration
 
-    config = Configuration('sparse',parent_package,top_path, 
+    config = Configuration('sparsetools',parent_package,top_path, 
                            setup_name = 'setupscons.py')
 
     config.add_sconscript('SConstruct')