Support the #import C preprocessor directive. (Greg Spencer)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 11658ffa5f77dcbdf7f521f094f77e8f558c3359..eb385e332856f063f059fb8a57e0a8e8e7d42eed 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -65,6 +65,10 @@ RELEASE 0.14 - XXX
 
   - Add support for using Ghostscript to convert Postscript to PDF files.
 
+  From Greg Spencer:
+
+  - Support the C preprocessor #import statement.
+
 
 
 RELEASE 0.13 - Mon, 31 Mar 2003 20:22:00 -0600

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index b59e66b58fb81c9bd3c8359da10ef77bf34d1a9b..c06774d29e45c3dcd9fd468b9c5186d2f4a87f9c 100644 (file)
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -38,7 +38,7 @@ import SCons.Scanner
 import SCons.Util
 import SCons.Warnings
 
-include_re = re.compile('^[ \t]*#[ \t]*include[ \t]+(<|")([^>"]+)(>|")', re.M)
+include_re = re.compile('^[ \t]*#[ \t]*(?:include|import)[ \t]+(<|")([^>"]+)(>|")', re.M)
 
 def CScan(fs = SCons.Node.FS.default_fs):
     """Return a prototype Scanner instance for scanning source files

diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py
index c865e6e22a4121b9792ef7241d2259d3bafaef50..907ad64ffe7b3189dcca9260bb3f232c9c1ca6e9 100644 (file)
--- a/src/engine/SCons/Scanner/CTests.py
+++ b/src/engine/SCons/Scanner/CTests.py
@@ -52,7 +52,7 @@ test.write('f2.cpp',"""
 #include \"d1/f1.h\"
 #include <d2/f1.h>
 #include \"f1.h\"
-#include <f4.h>
+#import <f4.h>
 
 int main()
 {