[Numpy-svn] r5268 - trunk/numpy/core

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-06-12 02:20:28 -0500 (Thu, 12 Jun 2008)
New Revision: 5268

Modified:
   trunk/numpy/core/scons_support.py
Log:
Remove distutils_dirs_emitter hacks: no need anymore since we use variant_dir.

Modified: trunk/numpy/core/scons_support.py
===================================================================
--- trunk/numpy/core/scons_support.py	2008-06-12 06:35:22 UTC (rev 5267)
+++ trunk/numpy/core/scons_support.py	2008-06-12 07:20:28 UTC (rev 5268)
@@ -1,4 +1,4 @@
-#! Last Change: Mon Apr 21 07:00 PM 2008 J
+#! Last Change: Thu Jun 12 02:00 PM 2008 J
 
 """Code to support special facilities to scons which are only useful for
 numpy.core, hence not put into numpy.distutils.scons"""
@@ -16,10 +16,6 @@
 
 from numscons.numdist import process_c_str as process_str
 from numscons.core.utils import rsplit, isstring
-try:
-    from numscons import distutils_dirs_emitter
-except ImportError:
-    raise ImportError("You need numscons >= 0.5.2")
 
 import SCons.Node
 import SCons
@@ -189,16 +185,14 @@
     return nosmp == 1
 
 array_api_gen_bld = Builder(action = Action(do_generate_numpy_api, '$ARRAPIGENCOMSTR'),
-                            emitter = [generate_api_emitter,
-                                       distutils_dirs_emitter])
+                            emitter = generate_api_emitter)
+                                       
 
 ufunc_api_gen_bld = Builder(action = Action(do_generate_ufunc_api, '$UFUNCAPIGENCOMSTR'),
-                            emitter = [generate_api_emitter,
-                                       distutils_dirs_emitter])
+                            emitter = generate_api_emitter)
 
 template_bld = Builder(action = Action(generate_from_template, '$TEMPLATECOMSTR'),
-                       emitter = [generate_from_template_emitter,
-                                  distutils_dirs_emitter])
+                       emitter = generate_from_template_emitter)
 
 umath_bld = Builder(action = Action(generate_umath, '$UMATHCOMSTR'),
-                    emitter = [generate_umath_emitter, distutils_dirs_emitter])
+                    emitter = generate_umath_emitter)