Commits

Anonymous committed 155b564

Easier customization of printable strings for , and .

Comments (0)

Files changed (23)

 The command line used to generate an object file
 from an assembly-language source file.
 
+.IP ASCOMSTR
+The string displayed when an object file
+is generated from an assembly-language source file.
+If this is not set, then $ASCOM (the command line) is displayed.
+
+.ES
+env = Environment(ASCOMSTR = "Assembling $TARGET")
+.EE
+
 .IP ASFLAGS
 General options passed to the assembler.
 
 Any options specified in the $CCFLAGS and $CPPFLAGS construction variables
 are included on this command line.
 
+.IP CCCOMSTR
+The string displayed when a C source file
+is compiled to a (static) object file.
+If this is not set, then $CCCOM (the command line) is displayed.
+
+.ES
+env = Environment(CCCOMSTR = "Compiling $TARGET")
+.EE
+
 .IP CCFLAGS 
 General options that are passed to the C compiler.
 
 Any options specified in the $CXXFLAGS and $CPPFLAGS construction variables
 are included on this command line.
 
+.IP CXXCOMSTR
+The string displayed when a C++ source file
+is compiled to a (static) object file.
+If this is not set, then $CXXCOM (the command line) is displayed.
+
+.ES
+env = Environment(CXXCOMSTR = "Compiling $TARGET")
+.EE
+
 .IP CXXFLAGS 
 General options that are passed to the C++ compiler.
 
   - Fix expansion of env.Command() overrides within target and
     source file names.
 
+  - Support easier configurability of what's displayed by various default
+    actions through new construction variables:  $ASCOMSTR, $CCCOMSTR,
+    $CXXCOMSTR.
+
   From Wayne Lee:
 
   - Avoid "maximum recursion limit" errors when removing $(-$) pairs

src/engine/SCons/Action.py

 
 class CommandAction(_ActionAction):
     """Class for command-execution actions."""
-    def __init__(self, cmd, *args, **kw):
+    def __init__(self, cmd, cmdstr=None, *args, **kw):
         # Cmd can actually be a list or a single item; if it's a
         # single item it should be the command string to execute; if a
         # list then it should be the words of the command string to
                 raise TypeError, "CommandAction should be given only " \
                       "a single command"
         self.cmd_list = cmd
+        self.cmdstr = cmdstr
 
     def __str__(self):
         if SCons.Util.is_List(self.cmd_list):
         return str(self.cmd_list)
 
     def strfunction(self, target, source, env):
+        if not self.cmdstr is None:
+            c = env.subst(self.cmdstr, 0, target, source)
+            if c:
+                return c
         cmd_list = env.subst_list(self.cmd_list, 0, target, source)
         return _string_from_cmd_list(cmd_list[0])
 

src/engine/SCons/ActionTests.py

         """
         a = SCons.Action.CommandAction(["xyzzy"])
         assert a.cmd_list == [ "xyzzy" ], a.cmd_list
+        assert a.cmdstr is None, a.cmdstr
+
+        a = SCons.Action.CommandAction(["abra"], "cadabra")
+        assert a.cmd_list == [ "abra" ], a.cmd_list
+        assert a.cmdstr == "cadabra", a.cmdstr
 
     def test___str__(self):
         """Test fetching the pre-substitution string for command Actions
         s = act.strfunction([t1, t2], [s1, s2], env)
         assert s == 'xyzzy t1 s1', s
 
+        act = SCons.Action.CommandAction('xyzzy $TARGET $SOURCE',
+                                         'cmdstr - $SOURCE - $TARGET -')
+        s = act.strfunction([], [], env)
+        assert s == 'cmdstr - - -', s
+        s = act.strfunction([t1], [s1], env)
+        assert s == 'cmdstr - s1 - t1 -', s
+        s = act.strfunction([t1, t2], [s1, s2], env)
+        assert s == 'cmdstr - s1 - t1 -', s
+
         act = SCons.Action.CommandAction('xyzzy $TARGETS $SOURCES')
         s = act.strfunction([], [], env)
         assert s == 'xyzzy', s
         s = act.strfunction([t1, t2], [s1, s2], env)
         assert s == 'xyzzy t1 t2 s1 s2', s
 
+        act = SCons.Action.CommandAction('xyzzy $TARGETS $SOURCES',
+                                         'cmdstr = $SOURCES = $TARGETS =')
+        s = act.strfunction([], [], env)
+        assert s == 'cmdstr = = =', s
+        s = act.strfunction([t1], [s1], env)
+        assert s == 'cmdstr = s1 = t1 =', s
+        s = act.strfunction([t1, t2], [s1, s2], env)
+        assert s == 'cmdstr = s1 s2 = t1 t2 =', s
+
         act = SCons.Action.CommandAction(['xyzzy',
                                           '$TARGET', '$SOURCE',
                                           '$TARGETS', '$SOURCES'])

src/engine/SCons/Defaults.py

 del suffix
 
 # Actions for common languages.
-CAction = SCons.Action.Action("$CCCOM")
+CAction = SCons.Action.Action("$CCCOM", "$CCCOMSTR")
 DAction = SCons.Action.Action("$DCOM")
 ShCAction = SCons.Action.Action("$SHCCCOM")
-CXXAction = SCons.Action.Action("$CXXCOM")
+CXXAction = SCons.Action.Action("$CXXCOM", "$CXXCOMSTR")
 ShCXXAction = SCons.Action.Action("$SHCXXCOM")
 
-ASAction = SCons.Action.Action("$ASCOM")
+ASAction = SCons.Action.Action("$ASCOM", "$ASCOMSTR")
 ASPPAction = SCons.Action.Action("$ASPPCOM")
 
 LinkAction = SCons.Action.Action("$LINKCOM")

test/AS.py

-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# 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 = TestSCons.python
-_exe   = TestSCons._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[:5] != '#link':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-    test.write('myas.py', r"""
-import sys
-args = sys.argv[1:]
-inf = None
-while args:
-    a = args[0]
-    args = args[1:]
-    if not a[0] in "/-":
-        if not inf:
-            inf = a
-        continue
-    if a[:3] == '/Fo': out = a[3:]
-    if a == '-o':
-        out = args[0]
-        args = args[1:]
-infile = open(inf, 'rb')
-outfile = open(out, 'wb')
-for l in infile.readlines():
-    if l[:3] != '#as':
-        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[:5] != '#link':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-    test.write('myas.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[:3] != '#as':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-test.write('SConstruct', """
-env = Environment(LINK = r'%s mylink.py',
-                  LINKFLAGS = [],
-                  AS = r'%s myas.py',
-                  CC = r'%s myas.py')
-env.Program(target = 'test1', source = 'test1.s')
-env.Program(target = 'test2', source = 'test2.S')
-env.Program(target = 'test3', source = 'test3.asm')
-env.Program(target = 'test4', source = 'test4.ASM')
-env.Program(target = 'test5', source = 'test5.spp')
-env.Program(target = 'test6', source = 'test6.SPP')
-""" % (python, python, python))
-
-test.write('test1.s', r"""This is a .s file.
-#as
-#link
-""")
-
-test.write('test2.S', r"""This is a .S file.
-#as
-#link
-""")
-
-test.write('test3.asm', r"""This is a .asm file.
-#as
-#link
-""")
-
-test.write('test4.ASM', r"""This is a .ASM file.
-#as
-#link
-""")
-
-test.write('test5.spp', r"""This is a .spp file.
-#as
-#link
-""")
-
-test.write('test6.SPP', r"""This is a .SPP file.
-#as
-#link
-""")
-
-test.run(arguments = '.', stderr = None)
-
-test.fail_test(test.read('test1' + _exe) != "This is a .s file.\n")
-
-test.fail_test(test.read('test2' + _exe) != "This is a .S file.\n")
-
-test.fail_test(test.read('test3' + _exe) != "This is a .asm file.\n")
-
-test.fail_test(test.read('test4' + _exe) != "This is a .ASM file.\n")
-
-test.fail_test(test.read('test5' + _exe) != "This is a .spp file.\n")
-
-test.fail_test(test.read('test6' + _exe) != "This is a .SPP file.\n")
-
-
-as = test.detect('AS', 'as')
-x86 = (sys.platform == 'win32' or string.find(sys.platform, 'linux') != -1)
-
-if as and x86:
-
-    test.write("wrapper.py", """\
-import os
-import string
-import sys
-open('%s', 'wb').write("wrapper.py: %%s\\n" %% sys.argv[-1])
-cmd = string.join(sys.argv[1:])
-os.system(cmd)
-""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
-
-    test.write('SConstruct', """\
-aaa = Environment()
-bbb = aaa.Copy(AS = r'%s wrapper.py ' + WhereIs('as'))
-ccc = aaa.Copy(CPPPATH=['.'])
-aaa.Program(target = 'aaa', source = ['aaa.s', 'aaa_main.c'])
-bbb.Program(target = 'bbb', source = ['bbb.s', 'bbb_main.c'])
-ccc.Program(target = 'ccc', source = ['ccc.S', 'ccc_main.c'])
-""" % python)
-
-    test.write('aaa.s', 
-"""        .file   "aaa.s"
-.data
-.align 4
-.globl name
-name:
-        .ascii	"aaa.s"
-	.byte	0
-""")
-
-    test.write('bbb.s', """\
-.file   "bbb.s"
-.data
-.align 4
-.globl name
-name:
-        .ascii	"bbb.s"
-	.byte	0
-""")
-
-    test.write('ccc.h', """\
-#define STRING  "ccc.S"
-""")
-
-    test.write('ccc.S', """\
-#include <ccc.h>
-.file   STRING
-.data
-.align 4
-.globl name
-name:
-        .ascii	STRING
-	.byte	0
-""")
-
-    test.write('aaa_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("aaa_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.write('bbb_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("bbb_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.write('ccc_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("ccc_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.write('ddd_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("ddd_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.run()
-
-    test.run(program = test.workpath('aaa'), stdout =  "aaa_main.c aaa.s\n")
-    test.run(program = test.workpath('bbb'), stdout =  "bbb_main.c bbb.s\n")
-    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.S\n")
-
-    test.fail_test(test.read('wrapper.out') != "wrapper.py: bbb.s\n")
-
-    test.write("ccc.h", """\
-#define STRING  "ccc.S 2"
-""")
-
-    test.run()
-    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.S 2\n")
-
-    test.unlink('wrapper.out')
-
-
-
-ml = test.where_is('ml')
-
-if ml and sys.platform == 'win32':
-
-    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', """
-import os
-ccc = Environment(tools = ['msvc', 'mslink', 'masm'],
-                  ASFLAGS = '/nologo /coff')
-ccc['ENV']['PATH'] = ccc['ENV']['PATH'] + os.pathsep + os.environ['PATH']
-ddd = ccc.Copy(AS = r'%s wrapper.py ' + ccc['AS'])
-ccc.Program(target = 'ccc', source = ['ccc.asm', 'ccc_main.c'])
-ddd.Program(target = 'ddd', source = ['ddd.asm', 'ddd_main.c'])
-""" % python)
-
-    test.write('ccc.asm', 
-"""
-DSEG	segment
-	PUBLIC _name
-_name	byte "ccc.asm",0
-DSEG	ends
-	end
-""")
-
-    test.write('ddd.asm', 
-"""        
-DSEG	segment
-	PUBLIC _name
-_name	byte "ddd.asm",0
-DSEG	ends
-	end
-""")
-
-    test.write('ccc_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("ccc_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.write('ddd_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("ddd_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.run(arguments = 'ccc' + _exe, stderr = None)
-
-    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.asm\n")
-
-    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
-
-    test.run(arguments = 'ddd' + _exe)
-
-    test.run(program = test.workpath('ddd'), stdout =  "ddd_main.c ddd.asm\n")
-
-    test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
-
-
-
-
-nasm = test.where_is('nasm')
-
-if nasm:
-
-    # Allow flexibility about the type of object/executable format
-    # needed on different systems.  Format_map is a dict that maps
-    # sys.platform substrings to the correct argument for the nasm -f
-    # option.  The default is "elf," which seems to be a reasonable
-    # lowest common denominator (works on both Linux and FreeBSD,
-    # anyway...).
-    nasm_format = 'elf'
-    format_map = {}
-    for k, v in format_map.items():
-        if string.find(sys.platform, k) != -1:
-            nasm_format = v
-            break
-
-    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', """
-eee = Environment(tools = ['gcc', 'gnulink', 'nasm'],
-                  ASFLAGS = '-f %s')
-fff = eee.Copy(AS = r'%s wrapper.py ' + WhereIs('nasm'))
-eee.Program(target = 'eee', source = ['eee.asm', 'eee_main.c'])
-fff.Program(target = 'fff', source = ['fff.asm', 'fff_main.c'])
-""" % (nasm_format, python))
-
-    test.write('eee.asm', 
-"""
-global name
-name:
-	db 'eee.asm',0
-""")
-
-    test.write('fff.asm', 
-"""        
-global name
-name:
-	db 'fff.asm',0
-""")
-
-    test.write('eee_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("eee_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.write('fff_main.c', r"""
-extern char name[];
-
-int
-main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("fff_main.c %s\n", name);
-        exit (0);
-}
-""")
-
-    test.run(arguments = 'eee' + _exe, stderr = None)
-
-    test.run(program = test.workpath('eee'), stdout =  "eee_main.c eee.asm\n")
-
-    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
-
-    test.run(arguments = 'fff' + _exe)
-
-    test.run(program = test.workpath('fff'), stdout =  "fff_main.c fff.asm\n")
-
-    test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
-
-
-
-test.pass_test()
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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 = TestSCons.python
+_exe   = TestSCons._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[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+while args:
+    a = args[0]
+    args = args[1:]
+    if not a[0] in "/-":
+        if not inf:
+            inf = a
+        continue
+    if a[:3] == '/Fo': out = a[3:]
+    if a == '-o':
+        out = args[0]
+        args = args[1:]
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+for l in infile.readlines():
+    if l[:3] != '#as':
+        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[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.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[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  AS = r'%s myas.py',
+                  CC = r'%s myas.py')
+env.Program(target = 'test1', source = 'test1.s')
+env.Program(target = 'test2', source = 'test2.S')
+env.Program(target = 'test3', source = 'test3.asm')
+env.Program(target = 'test4', source = 'test4.ASM')
+env.Program(target = 'test5', source = 'test5.spp')
+env.Program(target = 'test6', source = 'test6.SPP')
+""" % (python, python, python))
+
+test.write('test1.s', r"""This is a .s file.
+#as
+#link
+""")
+
+test.write('test2.S', r"""This is a .S file.
+#as
+#link
+""")
+
+test.write('test3.asm', r"""This is a .asm file.
+#as
+#link
+""")
+
+test.write('test4.ASM', r"""This is a .ASM file.
+#as
+#link
+""")
+
+test.write('test5.spp', r"""This is a .spp file.
+#as
+#link
+""")
+
+test.write('test6.SPP', r"""This is a .SPP file.
+#as
+#link
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.fail_test(test.read('test1' + _exe) != "This is a .s file.\n")
+
+test.fail_test(test.read('test2' + _exe) != "This is a .S file.\n")
+
+test.fail_test(test.read('test3' + _exe) != "This is a .asm file.\n")
+
+test.fail_test(test.read('test4' + _exe) != "This is a .ASM file.\n")
+
+test.fail_test(test.read('test5' + _exe) != "This is a .spp file.\n")
+
+test.fail_test(test.read('test6' + _exe) != "This is a .SPP file.\n")
+
+
+as = test.detect('AS', 'as')
+x86 = (sys.platform == 'win32' or string.find(sys.platform, 'linux') != -1)
+
+if as and x86:
+
+    test.write("wrapper.py", """\
+import os
+import string
+import sys
+open('%s', 'wb').write("wrapper.py: %%s\\n" %% sys.argv[-1])
+cmd = string.join(sys.argv[1:])
+os.system(cmd)
+""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+
+    test.write('SConstruct', """\
+aaa = Environment()
+bbb = aaa.Copy(AS = r'%s wrapper.py ' + WhereIs('as'))
+ccc = aaa.Copy(CPPPATH=['.'])
+aaa.Program(target = 'aaa', source = ['aaa.s', 'aaa_main.c'])
+bbb.Program(target = 'bbb', source = ['bbb.s', 'bbb_main.c'])
+ccc.Program(target = 'ccc', source = ['ccc.S', 'ccc_main.c'])
+""" % python)
+
+    test.write('aaa.s', 
+"""        .file   "aaa.s"
+.data
+.align 4
+.globl name
+name:
+        .ascii	"aaa.s"
+	.byte	0
+""")
+
+    test.write('bbb.s', """\
+.file   "bbb.s"
+.data
+.align 4
+.globl name
+name:
+        .ascii	"bbb.s"
+	.byte	0
+""")
+
+    test.write('ccc.h', """\
+#define STRING  "ccc.S"
+""")
+
+    test.write('ccc.S', """\
+#include <ccc.h>
+.file   STRING
+.data
+.align 4
+.globl name
+name:
+        .ascii	STRING
+	.byte	0
+""")
+
+    test.write('aaa_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("aaa_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.write('bbb_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("bbb_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.write('ccc_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("ccc_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.write('ddd_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("ddd_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.run()
+
+    test.run(program = test.workpath('aaa'), stdout =  "aaa_main.c aaa.s\n")
+    test.run(program = test.workpath('bbb'), stdout =  "bbb_main.c bbb.s\n")
+    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.S\n")
+
+    test.fail_test(test.read('wrapper.out') != "wrapper.py: bbb.s\n")
+
+    test.write("ccc.h", """\
+#define STRING  "ccc.S 2"
+""")
+
+    test.run()
+    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.S 2\n")
+
+    test.unlink('wrapper.out')
+
+
+
+ml = test.where_is('ml')
+
+if ml and sys.platform == 'win32':
+
+    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', """
+import os
+ccc = Environment(tools = ['msvc', 'mslink', 'masm'],
+                  ASFLAGS = '/nologo /coff')
+ccc['ENV']['PATH'] = ccc['ENV']['PATH'] + os.pathsep + os.environ['PATH']
+ddd = ccc.Copy(AS = r'%s wrapper.py ' + ccc['AS'])
+ccc.Program(target = 'ccc', source = ['ccc.asm', 'ccc_main.c'])
+ddd.Program(target = 'ddd', source = ['ddd.asm', 'ddd_main.c'])
+""" % python)
+
+    test.write('ccc.asm', 
+"""
+DSEG	segment
+	PUBLIC _name
+_name	byte "ccc.asm",0
+DSEG	ends
+	end
+""")
+
+    test.write('ddd.asm', 
+"""        
+DSEG	segment
+	PUBLIC _name
+_name	byte "ddd.asm",0
+DSEG	ends
+	end
+""")
+
+    test.write('ccc_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("ccc_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.write('ddd_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("ddd_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.run(arguments = 'ccc' + _exe, stderr = None)
+
+    test.run(program = test.workpath('ccc'), stdout =  "ccc_main.c ccc.asm\n")
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.run(arguments = 'ddd' + _exe)
+
+    test.run(program = test.workpath('ddd'), stdout =  "ddd_main.c ddd.asm\n")
+
+    test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
+
+
+
+
+nasm = test.where_is('nasm')
+
+if nasm:
+
+    # Allow flexibility about the type of object/executable format
+    # needed on different systems.  Format_map is a dict that maps
+    # sys.platform substrings to the correct argument for the nasm -f
+    # option.  The default is "elf," which seems to be a reasonable
+    # lowest common denominator (works on both Linux and FreeBSD,
+    # anyway...).
+    nasm_format = 'elf'
+    format_map = {}
+    for k, v in format_map.items():
+        if string.find(sys.platform, k) != -1:
+            nasm_format = v
+            break
+
+    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', """
+eee = Environment(tools = ['gcc', 'gnulink', 'nasm'],
+                  ASFLAGS = '-f %s')
+fff = eee.Copy(AS = r'%s wrapper.py ' + WhereIs('nasm'))
+eee.Program(target = 'eee', source = ['eee.asm', 'eee_main.c'])
+fff.Program(target = 'fff', source = ['fff.asm', 'fff_main.c'])
+""" % (nasm_format, python))
+
+    test.write('eee.asm', 
+"""
+global name
+name:
+	db 'eee.asm',0
+""")
+
+    test.write('fff.asm', 
+"""        
+global name
+name:
+	db 'fff.asm',0
+""")
+
+    test.write('eee_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("eee_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.write('fff_main.c', r"""
+extern char name[];
+
+int
+main(int argc, char *argv[])
+{
+        argv[argc++] = "--";
+        printf("fff_main.c %s\n", name);
+        exit (0);
+}
+""")
+
+    test.run(arguments = 'eee' + _exe, stderr = None)
+
+    test.run(program = test.workpath('eee'), stdout =  "eee_main.c eee.asm\n")
+
+    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+    test.run(arguments = 'fff' + _exe)
+
+    test.run(program = test.workpath('fff'), stdout =  "fff_main.c fff.asm\n")
+
+    test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
+
+
+
+test.pass_test()
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test the ability to configure the $ASCOM construction variable.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myas.py', r"""
+import sys
+infile = open(sys.argv[2], 'rb')
+outfile = open(sys.argv[1], 'wb')
+for l in filter(lambda l: l != "#as\n", infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+if os.path.normcase('.s') == os.path.normcase('.S'):
+    alt_s_suffix = '.S'
+    alt_asm_suffix = '.ASM'
+else:
+    alt_s_suffix = '.s'
+    alt_asm_suffix = '.asm'
+
+test.write('SConstruct', """
+env = Environment(ASCOM = r'%(python)s myas.py $TARGET $SOURCE',
+                  OBJSUFFIX = '.obj')
+env.Object(target = 'test1', source = 'test1.s')
+env.Object(target = 'test2', source = 'test2%(alt_s_suffix)s')
+env.Object(target = 'test3', source = 'test3.asm')
+env.Object(target = 'test4', source = 'test4%(alt_asm_suffix)s')
+""" % locals())
+
+test.write('test1.s', "test1.s\n#as\n")
+test.write('test2'+alt_s_suffix, "test2.S\n#as\n")
+test.write('test3.asm', "test3.asm\n#as\n")
+test.write('test4'+alt_asm_suffix, "test4.ASM\n#as\n")
+
+test.run(arguments = '.')
+
+test.fail_test(test.read('test1.obj') != "test1.s\n")
+test.fail_test(test.read('test2.obj') != "test2.S\n")
+test.fail_test(test.read('test3.obj') != "test3.asm\n")
+test.fail_test(test.read('test4.obj') != "test4.ASM\n")
+
+
+
+test.pass_test()

test/AS/ASCOMSTR.py

+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test that the $ASCOMSTR construction variable allows you to configure
+the assembly output.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myas.py', r"""
+import sys
+infile = open(sys.argv[2], 'rb')
+outfile = open(sys.argv[1], 'wb')
+for l in filter(lambda l: l != "#as\n", infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+if os.path.normcase('.s') == os.path.normcase('.S'):
+    alt_s_suffix = '.S'
+    alt_asm_suffix = '.ASM'
+else:
+    alt_s_suffix = '.s'
+    alt_asm_suffix = '.asm'
+
+test.write('SConstruct', """
+env = Environment(ASCOM = r'%(python)s myas.py $TARGET $SOURCE',
+                  ASCOMSTR = 'Assembling $TARGET from $SOURCE',
+                  OBJSUFFIX = '.obj')
+env.Object(target = 'test1', source = 'test1.s')
+env.Object(target = 'test2', source = 'test2%(alt_s_suffix)s')
+env.Object(target = 'test3', source = 'test3.asm')
+env.Object(target = 'test4', source = 'test4%(alt_asm_suffix)s')
+""" % locals())
+
+test.write('test1.s', "test1.s\n#as\n")
+test.write('test2'+alt_s_suffix, "test2.S\n#as\n")
+test.write('test3.asm', "test3.asm\n#as\n")
+test.write('test4'+alt_asm_suffix, "test4.ASM\n#as\n")
+
+test.run(stdout = test.wrap_stdout("""\
+Assembling test1.obj from test1.s
+Assembling test2.obj from test2%(alt_s_suffix)s
+Assembling test3.obj from test3.asm
+Assembling test4.obj from test4%(alt_asm_suffix)s
+""" % locals()))
+
+test.fail_test(test.read('test1.obj') != "test1.s\n")
+test.fail_test(test.read('test2.obj') != "test2.S\n")
+test.fail_test(test.read('test3.obj') != "test3.asm\n")
+test.fail_test(test.read('test4.obj') != "test4.ASM\n")
+
+
+
+test.pass_test()

test/AS/ASFLAGS.py

+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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 = TestSCons.python
+
+test = TestSCons.TestSCons()
+_exe = TestSCons._exe
+
+
+if sys.platform == 'win32':
+
+    o = ' -x'
+
+    o_c = ' -x'
+
+    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[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import sys
+args = sys.argv[1:]
+inf = None
+optstring = ''
+while args:
+    a = args[0]
+    args = args[1:]
+    if not a[0] in '/-':
+        if not inf:
+            inf = a
+        continue
+    if a[:2] == '/c':
+        continue
+    if a[:3] == '/Fo':
+        out = a[3:]
+        continue
+    optstring = optstring + ' ' + a
+infile = open(inf, 'rb')
+outfile = open(out, 'wb')
+outfile.write(optstring + "\n")
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+else:
+
+    o = ' -x'
+
+    o_c = ' -x -c'
+
+    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[:5] != '#link':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+    test.write('myas.py', r"""
+import getopt
+import sys
+opts, args = getopt.getopt(sys.argv[1:], 'co:x')
+optstring = ''
+for opt, arg in opts:
+    if opt == '-o': out = arg
+    else: optstring = optstring + ' ' + opt
+infile = open(args[0], 'rb')
+outfile = open(out, 'wb')
+outfile.write(optstring + "\n")
+for l in infile.readlines():
+    if l[:3] != '#as':
+        outfile.write(l)
+sys.exit(0)
+""")
+
+
+
+test.write('SConstruct', """
+env = Environment(LINK = r'%s mylink.py',
+                  LINKFLAGS = [],
+                  AS = r'%s myas.py', ASFLAGS = '-x',
+                  CC = r'%s myas.py')
+env.Program(target = 'test1', source = 'test1.s')
+env.Program(target = 'test2', source = 'test2.S')
+env.Program(target = 'test3', source = 'test3.asm')
+env.Program(target = 'test4', source = 'test4.ASM')
+env.Program(target = 'test5', source = 'test5.spp')
+env.Program(target = 'test6', source = 'test6.SPP')
+""" % (python, python, python))
+
+test.write('test1.s', r"""This is a .s file.
+#as
+#link
+""")
+
+test.write('test2.S', r"""This is a .S file.
+#as
+#link
+""")
+
+test.write('test3.asm', r"""This is a .asm file.
+#as
+#link
+""")
+
+test.write('test4.ASM', r"""This is a .ASM file.
+#as
+#link
+""")
+
+test.write('test5.spp', r"""This is a .spp file.
+#as
+#link
+""")
+
+test.write('test6.SPP', r"""This is a .SPP file.
+#as
+#link
+""")
+
+test.run(arguments = '.', stderr = None)
+
+if TestSCons.case_sensitive_suffixes('.s', '.S'):
+    o_css = o_c
+else:
+    o_css = o
+
+test.must_match('test1' + _exe, "%s\nThis is a .s file.\n" % o)
+test.must_match('test2' + _exe, "%s\nThis is a .S file.\n" % o_css)
+test.must_match('test3' + _exe, "%s\nThis is a .asm file.\n" % o)
+test.must_match('test4' + _exe, "%s\nThis is a .ASM file.\n" % o)
+test.must_match('test5' + _exe, "%s\nThis is a .spp file.\n" % o_c)
+test.must_match('test6' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
+
+test.pass_test()

test/ASFLAGS.py

-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# 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 = TestSCons.python
-
-test = TestSCons.TestSCons()
-_exe = TestSCons._exe
-
-
-if sys.platform == 'win32':
-
-    o = ' -x'
-
-    o_c = ' -x'
-
-    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[:5] != '#link':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-    test.write('myas.py', r"""
-import sys
-args = sys.argv[1:]
-inf = None
-optstring = ''
-while args:
-    a = args[0]
-    args = args[1:]
-    if not a[0] in '/-':
-        if not inf:
-            inf = a
-        continue
-    if a[:2] == '/c':
-        continue
-    if a[:3] == '/Fo':
-        out = a[3:]
-        continue
-    optstring = optstring + ' ' + a
-infile = open(inf, 'rb')
-outfile = open(out, 'wb')
-outfile.write(optstring + "\n")
-for l in infile.readlines():
-    if l[:3] != '#as':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-else:
-
-    o = ' -x'
-
-    o_c = ' -x -c'
-
-    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[:5] != '#link':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-    test.write('myas.py', r"""
-import getopt
-import sys
-opts, args = getopt.getopt(sys.argv[1:], 'co:x')
-optstring = ''
-for opt, arg in opts:
-    if opt == '-o': out = arg
-    else: optstring = optstring + ' ' + opt
-infile = open(args[0], 'rb')
-outfile = open(out, 'wb')
-outfile.write(optstring + "\n")
-for l in infile.readlines():
-    if l[:3] != '#as':
-        outfile.write(l)
-sys.exit(0)
-""")
-
-
-
-test.write('SConstruct', """
-env = Environment(LINK = r'%s mylink.py',
-                  LINKFLAGS = [],
-                  AS = r'%s myas.py', ASFLAGS = '-x',
-                  CC = r'%s myas.py')
-env.Program(target = 'test1', source = 'test1.s')
-env.Program(target = 'test2', source = 'test2.S')
-env.Program(target = 'test3', source = 'test3.asm')
-env.Program(target = 'test4', source = 'test4.ASM')
-env.Program(target = 'test5', source = 'test5.spp')
-env.Program(target = 'test6', source = 'test6.SPP')
-""" % (python, python, python))
-
-test.write('test1.s', r"""This is a .s file.
-#as
-#link
-""")
-
-test.write('test2.S', r"""This is a .S file.
-#as
-#link
-""")
-
-test.write('test3.asm', r"""This is a .asm file.
-#as
-#link
-""")
-
-test.write('test4.ASM', r"""This is a .ASM file.
-#as
-#link
-""")
-
-test.write('test5.spp', r"""This is a .spp file.
-#as
-#link
-""")
-
-test.write('test6.SPP', r"""This is a .SPP file.
-#as
-#link
-""")
-
-test.run(arguments = '.', stderr = None)
-
-if TestSCons.case_sensitive_suffixes('.s', '.S'):
-    o_css = o_c
-else:
-    o_css = o
-
-test.must_match('test1' + _exe, "%s\nThis is a .s file.\n" % o)
-test.must_match('test2' + _exe, "%s\nThis is a .S file.\n" % o_css)
-test.must_match('test3' + _exe, "%s\nThis is a .asm file.\n" % o)
-test.must_match('test4' + _exe, "%s\nThis is a .ASM file.\n" % o)
-test.must_match('test5' + _exe, "%s\nThis is a .spp file.\n" % o_c)
-test.must_match('test6' + _exe, "%s\nThis is a .SPP file.\n" % o_c)
-
-test.pass_test()

test/CC.py

-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# 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 = TestSCons.python
-_exe   = TestSCons._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('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',
-                  LINKFLAGS = [],
-                  CC = r'%s mycc.py',
-                  CXX = cc,
-                  CXXFLAGS = [])
-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
-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()
-cc = foo.Dictionary('CC')
-bar = Environment(CC = r'%s wrapper.py ' + cc)
-foo.Program(target = 'foo', source = 'foo.c')
-bar.Program(target = 'bar', source = 'bar.c')
-""" % python)
-
-test.write('foo.c', r"""
-int
-main(int argc, char *argv[])
-{
-	argv[argc++] = "--";
-	printf("foo.c\n");
-	exit (0);
-}
-""")
-
-test.write('bar.c', r"""
-int
-main(int argc, char *argv[])
-{
-	argv[argc++] = "--";
-	printf("foo.c\n");
-	exit (0);
-}
-""")
-
-
-test.run(arguments = 'foo' + _exe)
-
-test.fail_test(os.path.exists(test.workpath('wrapper.out')))
-
-test.up_to_date(arguments = 'foo' + _exe)
-
-test.run(arguments = 'bar' + _exe)
-
-test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
-
-test.up_to_date(arguments = 'bar' + _exe)
-
-test.pass_test()
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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 = TestSCons.python
+_exe   = TestSCons._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('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',
+                  LINKFLAGS = [],
+                  CC = r'%s mycc.py',
+                  CXX = cc,
+                  CXXFLAGS = [])
+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
+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()
+cc = foo.Dictionary('CC')
+bar = Environment(CC = r'%s wrapper.py ' + cc)
+foo.Program(target = 'foo', source = 'foo.c')
+bar.Program(target = 'bar', source = 'bar.c')
+""" % python)
+
+test.write('foo.c', r"""
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("foo.c\n");
+	exit (0);
+}
+""")
+
+test.write('bar.c', r"""
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("foo.c\n");
+	exit (0);
+}
+""")
+
+
+test.run(arguments = 'foo' + _exe)
+
+test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+
+test.up_to_date(arguments = 'foo' + _exe)
+
+test.run(arguments = 'bar' + _exe)
+
+test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
+
+test.up_to_date(arguments = 'bar' + _exe)
+
+test.pass_test()
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test the ability to configure the $CCCOM construction variable.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mycc.py', r"""
+import sys
+outfile = open(sys.argv[1], 'wb')
+infile = open(sys.argv[2], 'rb')
+for l in filter(lambda l: l[:6] != '/*cc*/', infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+if os.path.normcase('.c') == os.path.normcase('.C'):
+    alt_c_suffix = '.C'
+else:
+    alt_c_suffix = '.c'
+
+test.write('SConstruct', """
+env = Environment(CCCOM = r'%(python)s mycc.py $TARGET $SOURCE',
+                  OBJSUFFIX='.obj')
+env.Object(target = 'test1', source = 'test1.c')
+env.Object(target = 'test2', source = 'test2%(alt_c_suffix)s')
+""" % locals())
+
+test.write('test1.c', """\
+test1.c
+/*cc*/
+""")
+
+test.write('test2'+alt_c_suffix, """\
+test2.C
+/*cc*/
+""")
+
+test.run()
+
+test.must_match('test1.obj', "test1.c\n")
+test.must_match('test2.obj', "test2.C\n")
+
+
+
+test.pass_test()

test/CC/CCCOMSTR.py

+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test that the $CCCOMSTR construction variable allows you to configure
+the C compilation output.
+"""
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('mycc.py', r"""
+import sys
+outfile = open(sys.argv[1], 'wb')
+infile = open(sys.argv[2], 'rb')
+for l in filter(lambda l: l[:6] != '/*cc*/', infile.readlines()):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+if os.path.normcase('.c') == os.path.normcase('.C'):
+    alt_c_suffix = '.C'
+else:
+    alt_c_suffix = '.c'
+
+test.write('SConstruct', """
+env = Environment(CCCOM = r'%(python)s mycc.py $TARGET $SOURCE',
+                  CCCOMSTR = 'Building $TARGET from $SOURCE',
+                  OBJSUFFIX='.obj')
+env.Object(target = 'test1', source = 'test1.c')
+env.Object(target = 'test2', source = 'test2%(alt_c_suffix)s')
+""" % locals())
+
+test.write('test1.c', """\
+test1.c
+/*cc*/
+""")
+
+test.write('test2'+alt_c_suffix, """\
+test2.C
+/*cc*/
+""")
+
+test.run(stdout = test.wrap_stdout("""\
+Building test1.obj from test1.c
+Building test2.obj from test2%(alt_c_suffix)s
+""" % locals()))
+
+test.must_match('test1.obj', "test1.c\n")
+test.must_match('test2.obj', "test2.C\n")
+
+
+
+test.pass_test()

test/CC/CCFLAGS.py

+#!/usr/bin/env python
+#
+# __COPYRIGHT__