Support the Intel Fortran Compiler.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@452 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index fd1b3ffee06016ce4ff1d186dc9cadb283c0c0b0..eb0954c3d7970c8502a0aac2ba7abedc7728936e 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -746,6 +746,7 @@ dvipdf
 dvips
 g77
 icc
+ifl
 ilink
 latex
 lex
@@ -764,6 +765,9 @@ platforms:
 dvipdf
 dvips
 g77
+icc
+ifl
+ilink
 latex
 lex
 lib

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 32479f9f9c7abe5457d785bedaa33f92dfb88c2f..56e86c35f3a702a5d1acd1ce2a2f0a222de35cf2 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -24,6 +24,8 @@ RELEASE 0.09 -
 
  - Don't remove source files specified on the command line!
 
+ - Suport the Intel Fortran Compiler (ifl.exe).
+
  From Anthony Roach:
 
  - Fixed use of command lines with spaces in their arguments,

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index d791526f2c04707b04756bd0893d1c39902f839f..6d2a44bee4938550efc6d74d619ad8055d769824 100644 (file)
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -128,7 +128,7 @@ def createCFileBuilders(env):
 linkers = ['gnulink', 'mslink', 'ilink']
 c_compilers = ['gcc', 'msvc', 'icc']
 cxx_compilers = ['g++'] # only those that are seperate from the c compiler
-fortran_compilers = ['g77']
+fortran_compilers = ['g77', 'ifl']
 assemblers = ['gas', 'nasm', 'masm']
 other_tools = ['ar', 'dvipdf', 'dvips',
                'latex', 'lex', 'lib',

diff --git a/src/engine/SCons/Tool/ifl.py b/src/engine/SCons/Tool/ifl.py
new file mode 100644 (file)
index 0000000..1f4f8f4
--- /dev/null
+++ b/src/engine/SCons/Tool/ifl.py
@@ -0,0 +1,72 @@
+"""engine.SCons.Tool.icc
+
+Tool-specific initialization for the Intel Fortran compiler.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import string
+
+import SCons.Action
+import SCons.Tool
+import SCons.Errors
+
+F77Suffixes = ['.f', '.for', '.FOR']
+F77PPSuffixes = ['.fpp', '.FPP']
+if os.path.normcase('.f') == os.path.normcase('.F'):
+    F77Suffixes.append('.F')
+else:
+    F77PPSuffixes.append('.F')
+
+def generate(env, platform):
+    """Add Builders and construction variables for ifl to an Environment."""
+    static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
+
+    for suffix in F77Suffixes:
+        static_obj.add_action(suffix, SCons.Defaults.F77Action)
+        shared_obj.add_action(suffix, SCons.Defaults.ShF77Action)
+
+    for suffix in F77PPSuffixes:
+        static_obj.add_action(suffix, SCons.Defaults.F77PPAction)
+        shared_obj.add_action(suffix, SCons.Defaults.ShF77PPAction)
+
+    env['F77']        = 'ifl'
+    env['F77FLAGS']   = ''
+    env['F77COM']     = '$F77 $F77FLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET'
+    env['F77PPCOM']   = '$F77 $F77FLAGS $CPPFLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET'
+    env['SHF77']      = '$F77'
+    env['SHF77FLAGS'] = '$F77FLAGS'
+    env['SHF77COM']   = '$SHF77 $SHF77FLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET'
+    env['SHF77PPCOM'] = '$SHF77 $SHF77FLAGS $CPPFLAGS $_F77INCFLAGS /c $SOURCES /Fo$TARGET'
+
+def exists():
+    return SCons.Util.WhereIs('ifl')