diff options
author | David Cournapeau <cournape@gmail.com> | 2008-01-08 13:49:39 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2008-01-08 13:49:39 +0000 |
commit | 9c8ebbf0a26e19494df15deb95e5684685266952 (patch) | |
tree | 18ed1bf15b3a7f7abe1ffe7d5fee0c43b73ac5fc | |
parent | e8e32687533260b7b93fbef864212fac2d5a51f3 (diff) | |
download | numpy-9c8ebbf0a26e19494df15deb95e5684685266952.tar.gz |
Remove deprecated builder for config.h
-rw-r--r-- | numpy/core/SConstruct | 9 | ||||
-rw-r--r-- | numpy/core/scons_support.py | 37 |
2 files changed, 1 insertions, 45 deletions
diff --git a/numpy/core/SConstruct b/numpy/core/SConstruct index e3208957d..d93a06a0f 100644 --- a/numpy/core/SConstruct +++ b/numpy/core/SConstruct @@ -11,7 +11,6 @@ from numscons import CheckCBLAS from numscons import write_info from scons_support import CheckBrokenMathlib, define_no_smp, \ - generate_config_header, generate_config_header_emitter, \ check_mlib, check_mlibs, is_npy_no_signal env = GetNumpyEnvironment(ARGUMENTS) @@ -213,14 +212,10 @@ template_bld = Builder(action = generate_from_template, umath_bld = Builder(action = generate_umath, emitter = generate_umath_emitter) -config_h_bld = Builder(action = generate_config_header, - emitter = generate_config_header_emitter) - env.Append(BUILDERS = {'GenerateMultiarrayApi' : array_api_gen_bld, 'GenerateUfuncApi' : ufunc_api_gen_bld, 'GenerateFromTemplate' : template_bld, - 'GenerateUmath' : umath_bld, - 'GenerateConfigHeader' : config_h_bld}) + 'GenerateUmath' : umath_bld}) #------------------------ # Generate generated code @@ -230,8 +225,6 @@ env.Append(BUILDERS = {'GenerateMultiarrayApi' : array_api_gen_bld, # option ?) from os.path import join as pjoin -#config_header = env.GenerateConfigHeader(pjoin(env['build_dir'], 'config.h'), []) - scalartypes_src = env.GenerateFromTemplate( pjoin(env['build_dir'], 'src', 'scalartypes'), pjoin(env['src_dir'], 'src', 'scalartypes.inc.src')) diff --git a/numpy/core/scons_support.py b/numpy/core/scons_support.py index f682e644a..ab7bff1e7 100644 --- a/numpy/core/scons_support.py +++ b/numpy/core/scons_support.py @@ -93,43 +93,6 @@ def generate_umath_emitter(target, source, env): t = str(target[0]) + '.c' return ([t], source) -#------------------- -# Generate config.h -#------------------- -def generate_config_header(target, source, env): - t = open(str(target[0]), 'w') - if not env.has_key('CONFIG_H_GEN'): - # XXX - assert 0 == 1 - sym = env['CONFIG_H_GEN'] - def write_symbol(define, value): - if value == 1: - return "#define %s\n\n" % define - elif value == 0: - return "/* #undef %s */\n\n" % define - elif isstring(value): - return "#define %s %s\n\n" % (define, value) - else: - return "#define %s %s\n\n" % (define, ','.join(value)) - t.writelines([write_symbol(i[0], i[1]) for i in sym]) - t.write('\n') - t.close() - - print 'File: %s' % target[0] - target_f = open(str(target[0])) - print target_f.read() - target_f.close() - print 'EOF' - return 0 - -def generate_config_header_emitter(target, source, env): - """Add dependency from config list CONFIG_H_GEN to target. Returns - original target, source tuple unchanged. """ - from SCons.Script import Depends - d = deepcopy(env['CONFIG_H_GEN']) # copy it - Depends(target, SCons.Node.Python.Value(d)) - return target, source - #----------------------------------------- # Other functions related to configuration #----------------------------------------- |