[Numpy-svn] r3968 - trunk/numpy/distutils/fcompiler

[numpy-svn at scipy.org]

Author: cookedm
Date: 2007-08-17 13:23:46 -0500 (Fri, 17 Aug 2007)
New Revision: 3968

Modified:
   trunk/numpy/distutils/fcompiler/__init__.py
   trunk/numpy/distutils/fcompiler/vast.py
Log:
- fix specification of noopt, etc. in the config_fc command
- check that Fortran compiler aliases aren't duplicated
- don't use the superclass alias in the VAST fcompiler class


Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2007-08-15 21:36:38 UTC (rev 3967)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2007-08-17 18:23:46 UTC (rev 3968)
@@ -98,6 +98,7 @@
     # appropiate type used.
 
     distutils_vars = EnvironmentConfig(
+        distutils_section='config_fc',
         noopt = (None, None, 'noopt', str2bool),
         noarch = (None, None, 'noarch', str2bool),
         debug = (None, None, 'debug', str2bool),
@@ -229,6 +230,9 @@
         obj.executables = obj.executables.copy()
         return obj
 
+    def copy(self):
+        return self.__copy__()
+
     # Use properties for the attributes used by CCompiler. Setting them
     # as attributes from the self.executables dictionary is error-prone,
     # so we get them from there each time.
@@ -424,7 +428,7 @@
 
         This method gets Fortran compiler specific information from
         (i) class definition, (ii) environment, (iii) distutils config
-        files, and (iv) command line.
+        files, and (iv) command line (later overrides earlier).
 
         This method should be always called after constructing a
         compiler instance. But not in __init__ because Distribution
@@ -716,6 +720,10 @@
                 desc = (klass.compiler_type, klass, klass.description)
                 fcompiler_class[klass.compiler_type] = desc
                 for alias in klass.compiler_aliases:
+                    if alias in fcompiler_aliases:
+                        raise ValueError("alias %r defined for both %s and %s"
+                                         % (alias, klass.__name__,
+                                            fcompiler_aliases[alias][1].__name__))
                     fcompiler_aliases[alias] = desc
 
 def _find_existing_fcompiler(compiler_types,

Modified: trunk/numpy/distutils/fcompiler/vast.py
===================================================================
--- trunk/numpy/distutils/fcompiler/vast.py	2007-08-15 21:36:38 UTC (rev 3967)
+++ trunk/numpy/distutils/fcompiler/vast.py	2007-08-17 18:23:46 UTC (rev 3968)
@@ -5,8 +5,8 @@
 compilers = ['VastFCompiler']
 
 class VastFCompiler(GnuFCompiler):
-
     compiler_type = 'vast'
+    compiler_aliases = ()
     description = 'Pacific-Sierra Research Fortran 90 Compiler'
     version_pattern = r'\s*Pacific-Sierra Research vf90 '\
                       '(Personal|Professional)\s+(?P<version>[^\s]*)'