diff options
| author | David Cournapeau <cournape@gmail.com> | 2008-06-12 07:20:28 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2008-06-12 07:20:28 +0000 |
| commit | 1e11e53b9222ffe2fd288317702b99da427e5b86 (patch) | |
| tree | e0d79f023dbfbccf4c82e143efb4baf2bcc71a63 | |
| parent | e0b47b1e27dc8e6d1005598f517e1ab568d4805e (diff) | |
| download | numpy-1e11e53b9222ffe2fd288317702b99da427e5b86.tar.gz | |
Remove distutils_dirs_emitter hacks: no need anymore since we use variant_dir.
| -rw-r--r-- | numpy/core/scons_support.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/numpy/core/scons_support.py b/numpy/core/scons_support.py index c727b221f..9bbe3e41e 100644 --- a/numpy/core/scons_support.py +++ b/numpy/core/scons_support.py @@ -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 code_generators.generate_ufunc_api import \ 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 @@ def define_no_smp(): 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) |