Make the Fortran scanner case-insensitive. (David M. Cooke)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 037b6f69e2ac08461bdecae691b171b8f37c2233..08e007a56f376a768900bf11db098d24657310c8 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -20,6 +20,10 @@ RELEASE 0.95 - XXX
   - Accomodate the fact that Cygwin's os.path.normcase() lies about
     the underlying system being case-sensitive.
 
+  From David M. Cooke:
+
+  - Make the Fortran scanner case-insensitive for the INCLUDE string.
+
   From Charles Crain:
 
   - If no version of MSVC is detected but the tool is specified,

diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py
index 2e44eb9dbce002f10b2445d95a9d81ae8471203a..473375c811165396ad4774fb78aff265adb2eeec 100644 (file)
--- a/src/engine/SCons/Scanner/Fortran.py
+++ b/src/engine/SCons/Scanner/Fortran.py
@@ -44,6 +44,6 @@ def FortranScan(fs = SCons.Node.FS.default_fs):
     scanner = SCons.Scanner.Classic("FortranScan",
                                     [".f", ".F", ".for", ".FOR"],
                                     "F77PATH",
-                                    "INCLUDE[ \t]+'([\\w./\\\\]+)'",
+                                    "(?i)INCLUDE[ \t]+'([\\w./\\\\]+)'",
                                     fs = fs)
     return scanner

diff --git a/src/engine/SCons/Scanner/FortranTests.py b/src/engine/SCons/Scanner/FortranTests.py
index 7564c1e2b804253e039757c212b9ea99cf56daa4..a719765ecfb2f19e2ccc2d50461fa7e470505f0c 100644 (file)
--- a/src/engine/SCons/Scanner/FortranTests.py
+++ b/src/engine/SCons/Scanner/FortranTests.py
@@ -45,7 +45,7 @@ os.chdir(test.workpath(''))
 test.write('fff1.f',"""
       PROGRAM FOO
       INCLUDE 'f1.f'
-      INCLUDE 'f2.f'
+      include 'f2.f'
       STOP
       END
 """)
@@ -53,7 +53,7 @@ test.write('fff1.f',"""
 test.write('fff2.f',"""
       PROGRAM FOO
       INCLUDE 'f2.f'
-      INCLUDE 'd1/f2.f'
+      include 'd1/f2.f'
       INCLUDE 'd2/f2.f'
       STOP
       END

diff --git a/test/F77PATH.py b/test/F77PATH.py
index af3a9c92233c7a2d4df5158dc2aff76f99d63377..340c321bfd9c16cae9a86760c03507de16807e9f 100644 (file)
--- a/test/F77PATH.py
+++ b/test/F77PATH.py
@@ -77,7 +77,7 @@ test.write(['subdir', 'prog.f'],
 r"""
       PROGRAM PROG
       PRINT *, 'subdir/prog.f'
-      INCLUDE 'foo.f'
+      include 'foo.f'
       STOP
       END
 """)