Support a CPPFLAGS variable (a la GNU Make).

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

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 527b45d4174720d985ca230e198374722556b823..93086f69cbf7e7905cc77e5bf6397de6f6ef37f5 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -870,7 +870,9 @@ The default suffix, of course, is
 
 .IP CPPFLAGS
 C preprocessor options.
-These will be included in the $F77PPCOM 
+These will be included in any command that uses the C preprocessor,
+inluding not just compilation of C and C++ source files,
+but also the $F77PPCOM 
 command line used to compile a Fortran source file to an object file
 after first running the file through the C preprocessor.
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b3dc356234cef77251dca1b719857592cfed0f30..93bdb9ff419435662d2dce041dd07d5059669657 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -64,6 +64,9 @@ RELEASE 0.06 -
   - Add support for compiling Fortran programs from a variety of
     suffixes (a la GNU Make):  .f, .F, .for, .FOR, .fpp and .FPP
 
+  - Support a CPPFLAGS variable on all default commands that use the
+    C preprocessor.
+
   From Steve Leblanc:
 
   - Add support for the -U option.

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index d14bbc745efa17060b7ebae11ddcbde4f8648894..711130d722b3a2ae62cfad088c96616ea21fe4dd 100644 (file)
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -243,11 +243,11 @@ def make_win32_env_from_paths(include, lib, path):
     return {
         'CC'         : 'cl',
         'CCFLAGS'    : '/nologo',
-        'CCCOM'      : '$CC $CCFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET',
+        'CCCOM'      : '$CC $CCFLAGS $CPPFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET',
         'CFILESUFFIX' : '.c',
         'CXX'        : '$CC',
         'CXXFLAGS'   : '$CCFLAGS',
-        'CXXCOM'     : '$CXX $CXXFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET',
+        'CXXCOM'     : '$CXX $CXXFLAGS $CPPFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET',
         'CXXFILESUFFIX' : '.cc',
         'F77'        : 'g77',
         'F77FLAGS'   : '',
@@ -325,11 +325,11 @@ if os.name == 'posix':
     ConstructionEnvironment = {
         'CC'         : 'cc',
         'CCFLAGS'    : '',
-        'CCCOM'      : '$CC $CCFLAGS $_INCFLAGS -c -o $TARGET $SOURCES',
+        'CCCOM'      : '$CC $CCFLAGS $CPPFLAGS $_INCFLAGS -c -o $TARGET $SOURCES',
         'CFILESUFFIX' : '.c',
         'CXX'        : 'c++',
         'CXXFLAGS'   : '$CCFLAGS',
-        'CXXCOM'     : '$CXX $CXXFLAGS $_INCFLAGS -c -o $TARGET $SOURCES',
+        'CXXCOM'     : '$CXX $CXXFLAGS $CPPFLAGS $_INCFLAGS -c -o $TARGET $SOURCES',
         'CXXFILESUFFIX' : '.cc',
         'F77'        : 'g77',
         'F77FLAGS'   : '',

diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
new file mode 100644 (file)
index 0000000..977d9ff
--- /dev/null
+++ b/test/CPPFLAGS.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python
+#
+# 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
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+    _obj = '.obj'
+else:
+    _exe = ''
+    _obj = '.o'
+
+test = TestSCons.TestSCons()
+
+# Writing this to accomodate both our in-line tool chain and the
+# MSVC command lines is too hard, and will be completely unnecessary
+# some day when we separate our tests.  Punt for now.
+test.no_result(sys.platform == 'win32')
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import getopt
+import os
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args.pop(0)
+    if a[:5] == '/OUT:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:5] != '#link':
+       outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import os
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+outfile = open(out, 'wb')
+for f in args:
+    infile = open(f, 'rb')
+    for l in infile.readlines():
+        if l[:5] != '#link':
+            outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('mygcc.py', r"""
+import getopt
+import os
+import sys
+compiler = sys.argv[1]
+clen = len(compiler) + 1
+opts, args = getopt.getopt(sys.argv[2:], 'co:x')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+    elif opt == '-x': open('mygcc.out', 'ab').write(compiler + "\n")
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:clen] != '#' + compiler:
+       outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(CPPFLAGS = '-x',
+                  LINK = r'%s mylink.py',
+                  CC = r'%s mygcc.py cc',
+                  CXX = r'%s mygcc.py c++',
+                  F77 = r'%s mygcc.py g77')
+env.Program(target = 'foo', source = 'test1.c test2.cpp test3.F')
+""" % (python, python, python, python))
+
+test.write('test1.c', r"""test1.c
+#cc
+#link
+""")
+
+test.write('test2.cpp', r"""test2.cpp
+#c++
+#link
+""")
+
+test.write('test3.F', r"""test3.F
+#g77
+#link
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1' + _obj) != "test1.c\n#link\n")
+
+test.fail_test(test.read('test2' + _obj) != "test2.cpp\n#link\n")
+
+test.fail_test(test.read('test3' + _obj) != "test3.F\n#link\n")
+
+test.fail_test(test.read('foo' + _exe) != "test1.c\ntest2.cpp\ntest3.F\n")
+
+test.fail_test(test.read('mygcc.out') != "cc\nc++\ng77\n")
+
+test.pass_test()