Treat .c (lower case) and .C (upper case) files the same on case-insensitive systems.

2 files changed, 340 insertions, 0 deletions

diff --git a/test/CC.py b/test/CC.py
index 4bfb550..2028f3d 100644
--- a/test/CC.py
+++ b/test/CC.py
@@ -38,6 +38,117 @@ else:
 
 test = TestSCons.TestSCons()
 
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:8] != '/*link*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('mycc.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+while args:
+    a = args[0]
+    args = args[1:]
+    if a[0] != '/':
+        if not inf:
+            inf = a
+        continue
+    if a[:3] == '/Fo': out = a[3:]
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:6] != '/*cc*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:8] != '/*link*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('mycc.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'co:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:6] != '/*cc*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+cc = Environment().Dictionary('CC')
+env = Environment(LINK = r'%s mylink.py',
+                  CC = r'%s mycc.py',
+		  CXX = cc)
+env.Program(target = 'test1', source = 'test1.c')
+""" % (python, python))
+
+test.write('test1.c', r"""This is a .c file.
+/*cc*/
+/*link*/
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1' + _exe) != "This is a .c file.\n")
+
+if os.path.normcase('.c') == os.path.normcase('.C'):
+
+    test.write('SConstruct', """
+cc = Environment().Dictionary('CC')
+env = Environment(LINK = r'%s mylink.py',
+                  CC = r'%s mycc.py',
+		  CXX = cc)
+env.Program(target = 'test2', source = 'test2.C')
+""" % (python, python))
+
+    test.write('test2.C', r"""This is a .C file.
+/*cc*/
+/*link*/
+""")
+
+    test.run(arguments = '.', stderr = None)
+
+    test.fail_test(test.read('test2' + _exe) != "This is a .C file.\n")
+
+
+
+
 test.write("wrapper.py",
 """import os
 import string
diff --git a/test/CXX.py b/test/CXX.py
new file mode 100644
index 0000000..e3a78a0
--- /dev/null
+++ b/test/CXX.py
@@ -0,0 +1,229 @@
+#!/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'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+
+
+if sys.platform == 'win32':
+
+    test.write('mylink.py', r"""
+import string
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a[0] != '/':
+        break
+    args = args[1:]
+    if string.lower(a[:5]) == '/out:': out = a[5:]
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:8] != '/*link*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myc++.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+while args:
+    a = args[0]
+    args = args[1:]
+    if a[0] != '/':
+        if not inf:
+            inf = a
+        continue
+    if a[:3] == '/Fo': out = a[3:]
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:7] != '/*c++*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    test.write('mylink.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'o:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:8] != '/*link*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myc++.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'co:')
+for opt, arg in opts:
+    if opt == '-o': out = arg
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:7] != '/*c++*/':
+	outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  CXX = r'%s myc++.py')
+env.Program(target = 'test1', source = 'test1.cc')
+env.Program(target = 'test2', source = 'test2.cpp')
+env.Program(target = 'test3', source = 'test3.cxx')
+env.Program(target = 'test4', source = 'test4.c++')
+env.Program(target = 'test5', source = 'test5.C++')
+""" % (python, python))
+
+test.write('test1.cc', r"""This is a .cc file.
+/*c++*/
+/*link*/
+""")
+
+test.write('test2.cpp', r"""This is a .cpp file.
+/*c++*/
+/*link*/
+""")
+
+test.write('test3.cxx', r"""This is a .cxx file.
+/*c++*/
+/*link*/
+""")
+
+test.write('test4.c++', r"""This is a .c++ file.
+/*c++*/
+/*link*/
+""")
+
+test.write('test5.C++', r"""This is a .C++ file.
+/*c++*/
+/*link*/
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1' + _exe) != "This is a .cc file.\n")
+
+test.fail_test(test.read('test2' + _exe) != "This is a .cpp file.\n")
+
+test.fail_test(test.read('test3' + _exe) != "This is a .cxx file.\n")
+
+test.fail_test(test.read('test4' + _exe) != "This is a .c++ file.\n")
+
+test.fail_test(test.read('test5' + _exe) != "This is a .C++ file.\n")
+
+if os.path.normcase('.c') != os.path.normcase('.C'):
+
+    test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  CXX = r'%s myc++.py')
+env.Program(target = 'test6', source = 'test6.C')
+""" % (python, python))
+
+    test.write('test6.C', r"""This is a .C file.
+/*c++*/
+/*link*/
+""")
+
+    test.run(arguments = '.', stderr = None)
+
+    test.fail_test(test.read('test6' + _exe) != "This is a .C file.\n")
+
+
+
+
+test.write("wrapper.py",
+"""import os
+import string
+import sys
+open('%s', 'wb').write("wrapper.py\\n")
+os.system(string.join(sys.argv[1:], " "))
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+test.write('SConstruct', """
+foo = Environment()
+cxx = foo.Dictionary('CXX')
+bar = Environment(CXX = r'%s wrapper.py ' + cxx)
+foo.Program(target = 'foo', source = 'foo.cxx')
+bar.Program(target = 'bar', source = 'bar.cxx')
+""" % python)
+
+test.write('foo.cxx', r"""
+#include <stdio.h>
+#include <stdlib.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("foo.cxx\n");
+	exit (0);
+}
+""")
+
+test.write('bar.cxx', r"""
+#include <stdio.h>
+#include <stdlib.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("foo.cxx\n");
+	exit (0);
+}
+""")
+
+
+test.run(arguments = 'foo' + _exe)
+
+test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+test.run(arguments = 'bar' + _exe)
+
+test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
+
+test.pass_test()