diff options
author | cookedm <cookedm@localhost> | 2007-06-15 21:24:46 +0000 |
---|---|---|
committer | cookedm <cookedm@localhost> | 2007-06-15 21:24:46 +0000 |
commit | 635a9fbf1cc87531888eaf50d09bb559e4ad2dfa (patch) | |
tree | 1001c24b4b5ab6aec138f37bd6e6bad5080e8ad8 /numpy/distutils/ccompiler.py | |
parent | 46f195b0637b929643906c8ba7b1392849abe9ac (diff) | |
download | numpy-635a9fbf1cc87531888eaf50d09bb559e4ad2dfa.tar.gz |
Better version handling in fcompiler
* Remove FCompiler.get_version_cmd, FCompiler.get_flags_version,
FCompiler.get_linker_so_cmd, and FCompiler.get_linker_exe_cmd;
subclasses should do this in FCompiler.update_executables()
* FCompiler attributes .compiler_f77, .version_cmd, etc., are now
properties that read from the .executables dictionary.
* Update intel.py and absoft.py for above
* Add extra asserts for defensive programming. Most of our problems
here seem to come from bad values being generated, and the error not
being caught until later.
* must call FCompiler.customize() before FCompiler.get_version();
command/build_ext.py and command/config.py updated
* verify that commands make sense earlier -- must be None or
lists of strings
Also,
* add IA-32 as another pattern to search for in 32-bit Intel
compiler version.
* minor formatting
* add debugging helpers to environment.py:EnvironmentConfig class
Diffstat (limited to 'numpy/distutils/ccompiler.py')
-rw-r--r-- | numpy/distutils/ccompiler.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index bb11bb299..1436dc5da 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -174,8 +174,10 @@ def CCompiler_show_customization(self): if not attr: continue log.info("compiler '%s' is set to %s" % (attrname,attr)) - try: self.get_version() - except: pass + try: + self.get_version() + except: + pass if log._global_log.threshold<2: print '*'*80 print self.__class__ @@ -251,8 +253,8 @@ def simple_version_match(pat=r'[-.\d]+', ignore='', start=''): return m.group(0) return matcher -def CCompiler_get_version(self, force=0, ok_status=[0]): - """ Compiler version. Returns None if compiler is not available. """ +def CCompiler_get_version(self, force=False, ok_status=[0]): + """Compiler version. Returns None if compiler is not available.""" if not force and hasattr(self,'version'): return self.version self.find_executables() |