summaryrefslogtreecommitdiff
path: root/misc_util.py
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2007-05-21 13:15:45 +0000
committercookedm <cookedm@localhost>2007-05-21 13:15:45 +0000
commit6ac33ee4e12b78b164a05046f7e029681f0e09a3 (patch)
treed5a4b6f27ff9e3d596bafdb4c93953d5431d0a40 /misc_util.py
parentb93a94b5e15d229e253353289c571c7a3142a642 (diff)
downloadnumpy-6ac33ee4e12b78b164a05046f7e029681f0e09a3.tar.gz
[distutils-revamp] Merged revisions 3769-3794 via svnmerge from
http://svn.scipy.org/svn/numpy/trunk/numpy/distutils ........ r3775 | pearu | 2007-05-18 10:32:33 -0400 (Fri, 18 May 2007) | 1 line build_src: introduced --swig and other related options (as in std distutils build_ext command), use --f2py-opts instead of --f2pyflags, improved error messages. ........ r3776 | pearu | 2007-05-18 12:41:44 -0400 (Fri, 18 May 2007) | 1 line Extension modules and libraries are built with suitable compilers/linkers. Improved failure handling. ........ r3779 | pearu | 2007-05-18 13:33:15 -0400 (Fri, 18 May 2007) | 1 line Fixed warnings on language changes. ........ r3780 | pearu | 2007-05-18 16:17:48 -0400 (Fri, 18 May 2007) | 1 line unify config_fc, build_clib, build_ext commands --fcompiler options so that --fcompiler can be specified only once in a command line ........ r3781 | pearu | 2007-05-18 16:41:10 -0400 (Fri, 18 May 2007) | 1 line added config to --fcompiler option unification method. introduced config_cc for unifying --compiler options. ........ r3782 | pearu | 2007-05-18 16:49:09 -0400 (Fri, 18 May 2007) | 1 line Added --help-fcompiler option to build_ext command. ........ r3783 | pearu | 2007-05-18 17:00:17 -0400 (Fri, 18 May 2007) | 1 line show less messages in --help-fcompiler ........ r3784 | pearu | 2007-05-18 17:25:23 -0400 (Fri, 18 May 2007) | 1 line Added --fcompiler,--help-fcompiler options to build command parallel to --compiler,--help-compiler options. ........ r3785 | pearu | 2007-05-18 17:33:07 -0400 (Fri, 18 May 2007) | 1 line Add descriptions to config_fc and config_cc commands. ........ r3786 | pearu | 2007-05-19 05:54:00 -0400 (Sat, 19 May 2007) | 1 line Fix for win32 platform. ........ r3787 | pearu | 2007-05-19 06:23:16 -0400 (Sat, 19 May 2007) | 1 line Fix fcompiler/compiler unification warning. ........ r3788 | pearu | 2007-05-19 11:20:48 -0400 (Sat, 19 May 2007) | 1 line Fix atlas version detection when using MSVC compiler ........ r3789 | pearu | 2007-05-19 11:21:41 -0400 (Sat, 19 May 2007) | 1 line Fix typo. ........ r3790 | pearu | 2007-05-19 11:24:20 -0400 (Sat, 19 May 2007) | 1 line More typo fixes. ........ r3791 | pearu | 2007-05-19 13:01:39 -0400 (Sat, 19 May 2007) | 1 line win32: fix install when build has been carried out earlier. ........ r3792 | pearu | 2007-05-19 15:44:42 -0400 (Sat, 19 May 2007) | 1 line Clean up and completed (hopefully) MSVC support. ........ r3794 | cookedm | 2007-05-21 09:01:20 -0400 (Mon, 21 May 2007) | 1 line minor cleanups in numpy.distutils (style mostly) ........
Diffstat (limited to 'misc_util.py')
-rw-r--r--misc_util.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/misc_util.py b/misc_util.py
index fd771429e..bc3a9b8ad 100644
--- a/misc_util.py
+++ b/misc_util.py
@@ -309,8 +309,9 @@ def as_list(seq):
return [seq]
def get_language(sources):
+ # not used in numpy/scipy packages, use build_ext.detect_language instead
""" Determine language value (c,f77,f90) from sources """
- language = 'c'
+ language = None
for source in sources:
if isinstance(source, str):
if f90_ext_match(source):
@@ -1020,11 +1021,7 @@ class Configuration(object):
ext_args = copy.copy(kw)
ext_args['name'] = dot_join(self.name,name)
ext_args['sources'] = sources
-
- language = ext_args.get('language',None)
- if language is None:
- ext_args['language'] = get_language(sources)
-
+
if ext_args.has_key('extra_info'):
extra_info = ext_args['extra_info']
del ext_args['extra_info']
@@ -1089,10 +1086,6 @@ class Configuration(object):
name = name #+ '__OF__' + self.name
build_info['sources'] = sources
- language = build_info.get('language',None)
- if language is None:
- build_info['language'] = get_language(sources)
-
self._fix_paths_dict(build_info)
self.libraries.append((name,build_info))