[Numpy-svn] r3784 - in trunk/numpy/distutils: command fcompiler

[numpy-svn at scipy.org]

Author: pearu
Date: 2007-05-18 16:25:23 -0500 (Fri, 18 May 2007)
New Revision: 3784

Modified:
   trunk/numpy/distutils/command/build.py
   trunk/numpy/distutils/command/config_compiler.py
   trunk/numpy/distutils/fcompiler/__init__.py
Log:
Added --fcompiler,--help-fcompiler options to build command parallel to --compiler,--help-compiler options.

Modified: trunk/numpy/distutils/command/build.py
===================================================================
--- trunk/numpy/distutils/command/build.py	2007-05-18 21:00:17 UTC (rev 3783)
+++ trunk/numpy/distutils/command/build.py	2007-05-18 21:25:23 UTC (rev 3784)
@@ -2,6 +2,7 @@
 import sys
 from distutils.command.build import build as old_build
 from distutils.util import get_platform
+from numpy.distutils.command.config_compiler import show_fortran_compilers
 
 class build(old_build):
 
@@ -10,6 +11,21 @@
                     ('build_src',     old_build.has_ext_modules),
                     ] + old_build.sub_commands
 
+    user_options = old_build.user_options + [
+        ('fcompiler=', None,
+         "specify the Fortran compiler type"),
+        ]
+
+    help_options = old_build.help_options + [
+        ('help-fcompiler',None, "list available Fortran compilers",
+         show_fortran_compilers),
+        ]
+
+    def initialize_options(self):
+        old_build.initialize_options(self)
+        self.fcompiler = None
+        return
+
     def finalize_options(self):
         build_scripts = self.build_scripts
         old_build.finalize_options(self)

Modified: trunk/numpy/distutils/command/config_compiler.py
===================================================================
--- trunk/numpy/distutils/command/config_compiler.py	2007-05-18 21:00:17 UTC (rev 3783)
+++ trunk/numpy/distutils/command/config_compiler.py	2007-05-18 21:25:23 UTC (rev 3784)
@@ -9,7 +9,6 @@
     # Using cache to prevent infinite recursion
     if _cache: return
     _cache.append(1)
-    log.set_verbosity(-2)
     from numpy.distutils.fcompiler import show_fcompilers
     import distutils.core
     dist = distutils.core._setup_distribution
@@ -57,11 +56,12 @@
         return
 
     def finalize_options(self):
-        log.info('unifing config_fc, config, build_clib, build_ext commands --fcompiler options')
+        log.info('unifing config_fc, config, build_clib, build_ext, build commands --fcompiler options')
         build_clib = self.get_finalized_command('build_clib')
         build_ext = self.get_finalized_command('build_ext')
         config = self.get_finalized_command('config')
-        cmd_list = [self, config, build_clib, build_ext]
+        build = self.get_finalized_command('build')
+        cmd_list = [self, config, build_clib, build_ext, build]
         for a in ['fcompiler']:
             l = []
             for c in cmd_list:
@@ -95,11 +95,12 @@
         return
 
     def finalize_options(self):
-        log.info('unifing config_cc, config, build_clib, build_ext commands --compiler options')
+        log.info('unifing config_cc, config, build_clib, build_ext, build commands --compiler options')
         build_clib = self.get_finalized_command('build_clib')
         build_ext = self.get_finalized_command('build_ext')
         config = self.get_finalized_command('config')
-        cmd_list = [self, config, build_clib, build_ext]
+        build = self.get_finalized_command('build')
+        cmd_list = [self, config, build_clib, build_ext, build]
         for a in ['compiler']:
             l = []
             for c in cmd_list:

Modified: trunk/numpy/distutils/fcompiler/__init__.py
===================================================================
--- trunk/numpy/distutils/fcompiler/__init__.py	2007-05-18 21:00:17 UTC (rev 3783)
+++ trunk/numpy/distutils/fcompiler/__init__.py	2007-05-18 21:25:23 UTC (rev 3784)
@@ -710,12 +710,12 @@
         dist.cmdclass['config_fc'] = config_fc
         dist.parse_config_files()
         dist.parse_command_line()
-
     compilers = []
     compilers_na = []
     compilers_ni = []
     for compiler in fcompiler_class.keys():
         v = 'N/A'
+        log.set_verbosity(-2)
         try:
             c = new_fcompiler(compiler=compiler)
             c.customize(dist)
@@ -724,6 +724,7 @@
             pass
         except Exception, msg:
             log.warn(msg)
+
         if v is None:
             compilers_na.append(("fcompiler="+compiler, None,
                               fcompiler_class[compiler][2]))