[Numpy-svn] r3844 - trunk/numpy/distutils/command

[numpy-svn at scipy.org]

Author: cookedm
Date: 2007-05-30 19:51:48 -0500 (Wed, 30 May 2007)
New Revision: 3844

Modified:
   trunk/numpy/distutils/command/build_clib.py
   trunk/numpy/distutils/command/build_ext.py
   trunk/numpy/distutils/command/config.py
Log:
do an appropiate behaviour in the distutils commands when new_fcompiler returns None


Modified: trunk/numpy/distutils/command/build_clib.py
===================================================================
--- trunk/numpy/distutils/command/build_clib.py	2007-05-31 00:05:15 UTC (rev 3843)
+++ trunk/numpy/distutils/command/build_clib.py	2007-05-31 00:51:48 UTC (rev 3844)
@@ -78,14 +78,15 @@
                                            dry_run=self.dry_run,
                                            force=self.force,
                                            requiref90='f90' in languages)
-            self.fcompiler.customize(self.distribution)
+            if self.compiler is not None:
+                self.fcompiler.customize(self.distribution)
 
-            libraries = self.libraries
-            self.libraries = None
-            self.fcompiler.customize_cmd(self)
-            self.libraries = libraries
+                libraries = self.libraries
+                self.libraries = None
+                self.fcompiler.customize_cmd(self)
+                self.libraries = libraries
 
-            self.fcompiler.show_customization()
+                self.fcompiler.show_customization()
 
         self.build_libraries(self.libraries)
 
@@ -143,10 +144,11 @@
                                           dry_run=self.dry_run,
                                           force=self.force,
                                           requiref90=requiref90)
-                dist = self.distribution
-                base_config_fc = dist.get_option_dict('config_fc').copy()
-                base_config_fc.update(config_fc)
-                fcompiler.customize(base_config_fc)
+                if fcompiler is not None:
+                    dist = self.distribution
+                    base_config_fc = dist.get_option_dict('config_fc').copy()
+                    base_config_fc.update(config_fc)
+                    fcompiler.customize(base_config_fc)
 
             # check availability of Fortran compilers
             if (f_sources or fmodule_sources) and fcompiler is None:

Modified: trunk/numpy/distutils/command/build_ext.py
===================================================================
--- trunk/numpy/distutils/command/build_ext.py	2007-05-31 00:05:15 UTC (rev 3843)
+++ trunk/numpy/distutils/command/build_ext.py	2007-05-31 00:51:48 UTC (rev 3844)
@@ -175,7 +175,7 @@
                                                force=self.force,
                                                requiref90=False)
             fcompiler = self._f77_compiler
-            if fcompiler.get_version():
+            if fcompiler and fcompiler.get_version():
                 fcompiler.customize(self.distribution)
                 fcompiler.customize_cmd(self)
                 fcompiler.show_customization()
@@ -194,7 +194,7 @@
                                                force=self.force,
                                                requiref90=True)
             fcompiler = self._f90_compiler
-            if fcompiler.get_version():
+            if fcompiler and fcompiler.get_version():
                 fcompiler.customize(self.distribution)
                 fcompiler.customize_cmd(self)
                 fcompiler.show_customization()

Modified: trunk/numpy/distutils/command/config.py
===================================================================
--- trunk/numpy/distutils/command/config.py	2007-05-31 00:05:15 UTC (rev 3843)
+++ trunk/numpy/distutils/command/config.py	2007-05-31 00:51:48 UTC (rev 3844)
@@ -28,9 +28,10 @@
         if not isinstance(self.fcompiler, FCompiler):
             self.fcompiler = new_fcompiler(compiler=self.fcompiler,
                                            dry_run=self.dry_run, force=1)
-            self.fcompiler.customize(self.distribution)
-            self.fcompiler.customize_cmd(self)
-            self.fcompiler.show_customization()
+            if self.fcompiler is not None:
+                self.fcompiler.customize(self.distribution)
+                self.fcompiler.customize_cmd(self)
+                self.fcompiler.show_customization()
 
     def _wrap_method(self,mth,lang,args):
         from distutils.ccompiler import CompileError