From 27db7fcdedd3043ae5d2f7f869f07e8533e63ba3 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Mon, 15 Nov 2004 18:42:13 +0000 Subject: More display customizability: , . (Also add the missing , for completeness, and gets rid of the unused SCons.Defaults.DAction object.) --- doc/man/scons.1 | 25 +++++++ src/CHANGES.txt | 6 +- src/engine/SCons/Defaults.py | 5 +- src/engine/SCons/Tool/as.py | 3 +- test/AR.py | 97 --------------------------- test/AR/AR.py | 97 +++++++++++++++++++++++++++ test/AR/ARCOM.py | 66 +++++++++++++++++++ test/AR/ARCOMSTR.py | 70 ++++++++++++++++++++ test/AR/ARFLAGS.py | 97 +++++++++++++++++++++++++++ test/ARFLAGS.py | 97 --------------------------- test/AS/ASPP.py | 139 +++++++++++++++++++++++++++++++++++++++ test/AS/ASPPCOM.py | 68 +++++++++++++++++++ test/AS/ASPPCOMSTR.py | 73 +++++++++++++++++++++ test/AS/ASPPFLAGS.py | 152 +++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 794 insertions(+), 201 deletions(-) delete mode 100644 test/AR.py create mode 100644 test/AR/AR.py create mode 100644 test/AR/ARCOM.py create mode 100644 test/AR/ARCOMSTR.py create mode 100644 test/AR/ARFLAGS.py delete mode 100644 test/ARFLAGS.py create mode 100644 test/AS/ASPP.py create mode 100644 test/AS/ASPPCOM.py create mode 100644 test/AS/ASPPCOMSTR.py create mode 100644 test/AS/ASPPFLAGS.py diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 6c11a6e..b018e98 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -4431,6 +4431,15 @@ The static library archiver. .IP ARCOM The command line used to generate a static library from object files. +.IP ARCOMSTR +The string displayed when an object file +is generated from an assembly-language source file. +If this is not set, then $ARCOM (the command line) is displayed. + +.ES +env = Environment(ARCOMSTR = "Archiving $TARGET") +.EE + .IP ARFLAGS General options passed to the static library archiver. @@ -4460,6 +4469,22 @@ after first running the file through the C preprocessor. Any options specified in the $ASFLAGS and $CPPFLAGS construction variables are included on this command line. +.IP ASPPCOMSTR +The string displayed when an object file +is generated from an assembly-language source file +after first running the file through the C preprocessor. +If this is not set, then $ASPPCOM (the command line) is displayed. + +.ES +env = Environment(ASPPCOMSTR = "Assembling $TARGET") +.EE + +.IP ASPPFLAGS +General options when an assembling an assembly-language +source file into an object file +after first running the file through the C preprocessor. +The default is to use the value of $ASFLAGS. + .IP BIBTEX The bibliography generator for the TeX formatter and typesetter and the LaTeX structured formatter and typesetter. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d89d29c..6bb6d09 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -131,9 +131,9 @@ RELEASE 0.97 - XXX source file names. - Support easier configurability of what's displayed by various default - actions by adding new construction variables: $ASCOMSTR, $CCCOMSTR, - $CXXCOMSTR, $LEXCOMSTR, $LINKCOMSTR, $SHCCCOMSTR, $SHCXXCOMSTR, - $SHLINKCOMSTR and $YACCCOMSTR. + actions by adding new construction variables: $ARCOMSTR, $ASCOMSTR, + $ASPPCOMSTR, $CCCOMSTR, $CXXCOMSTR, $LEXCOMSTR, $LINKCOMSTR, + $SHCCCOMSTR, $SHCXXCOMSTR, $SHLINKCOMSTR and $YACCCOMSTR. From Wayne Lee: diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 6f90f5b..b3312f7 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -121,18 +121,17 @@ del suffix # Actions for common languages. CAction = SCons.Action.Action("$CCCOM", "$CCCOMSTR") -DAction = SCons.Action.Action("$DCOM") ShCAction = SCons.Action.Action("$SHCCCOM", "$SHCCCOMSTR") CXXAction = SCons.Action.Action("$CXXCOM", "$CXXCOMSTR") ShCXXAction = SCons.Action.Action("$SHCXXCOM", "$SHCXXCOMSTR") ASAction = SCons.Action.Action("$ASCOM", "$ASCOMSTR") -ASPPAction = SCons.Action.Action("$ASPPCOM") +ASPPAction = SCons.Action.Action("$ASPPCOM", "$ASPPCOMSTR") LinkAction = SCons.Action.Action("$LINKCOM", "$LINKCOMSTR") ShLinkAction = SCons.Action.Action("$SHLINKCOM", "$SHLINKCOMSTR") -ArAction = SCons.Action.Action("$ARCOM") +ArAction = SCons.Action.Action("$ARCOM", "$ARCOMSTR") LexAction = SCons.Action.Action("$LEXCOM", "$LEXCOMSTR") YaccAction = SCons.Action.Action("$YACCCOM", "$YACCCOMSTR") diff --git a/src/engine/SCons/Tool/as.py b/src/engine/SCons/Tool/as.py index 2bbc891..5a267a5 100644 --- a/src/engine/SCons/Tool/as.py +++ b/src/engine/SCons/Tool/as.py @@ -61,7 +61,8 @@ def generate(env): env['AS'] = env.Detect(assemblers) or 'as' env['ASFLAGS'] = SCons.Util.CLVar('') env['ASCOM'] = '$AS $ASFLAGS -o $TARGET $SOURCES' - env['ASPPCOM'] = '$CC $ASFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' + env['ASPPFLAGS'] = '$ASFLAGS' + env['ASPPCOM'] = '$CC $ASPPFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' def exists(env): return env.Detect(assemblers) diff --git a/test/AR.py b/test/AR.py deleted file mode 100644 index 81a57b5..0000000 --- a/test/AR.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/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() - -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(LIBS = ['foo'], LIBPATH = ['.']) -ar = foo.Dictionary('AR') -bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], AR = r'%s wrapper.py ' + ar) -foo.Library(target = 'foo', source = 'foo.c') -bar.Library(target = 'bar', source = 'bar.c') - -obj = foo.Object('main', 'main.c') - -foo.Program(target = 'f', source = obj) -bar.Program(target = 'b', source = obj) -""" % python) - -test.write('foo.c', r""" -void -library_function(void) -{ - printf("foo.c\n"); -} -""") - -test.write('bar.c', r""" -void -library_function(void) -{ - printf("bar.c\n"); -} -""") - -test.write('main.c', r""" -int -main(int argc, char *argv[]) -{ - argv[argc++] = "--"; - library_function(); - exit (0); -} -""") - - -test.run(arguments = 'f' + _exe, - stderr=TestSCons.noisy_ar, - match=TestSCons.match_re_dotall) - -test.fail_test(os.path.exists(test.workpath('wrapper.out'))) - -test.run(arguments = 'b' + _exe, - stderr=TestSCons.noisy_ar, - match=TestSCons.match_re_dotall) - -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") - -test.pass_test() diff --git a/test/AR/AR.py b/test/AR/AR.py new file mode 100644 index 0000000..81a57b5 --- /dev/null +++ b/test/AR/AR.py @@ -0,0 +1,97 @@ +#!/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() + +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(LIBS = ['foo'], LIBPATH = ['.']) +ar = foo.Dictionary('AR') +bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], AR = r'%s wrapper.py ' + ar) +foo.Library(target = 'foo', source = 'foo.c') +bar.Library(target = 'bar', source = 'bar.c') + +obj = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = obj) +bar.Program(target = 'b', source = obj) +""" % python) + +test.write('foo.c', r""" +void +library_function(void) +{ + printf("foo.c\n"); +} +""") + +test.write('bar.c', r""" +void +library_function(void) +{ + printf("bar.c\n"); +} +""") + +test.write('main.c', r""" +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + library_function(); + exit (0); +} +""") + + +test.run(arguments = 'f' + _exe, + stderr=TestSCons.noisy_ar, + match=TestSCons.match_re_dotall) + +test.fail_test(os.path.exists(test.workpath('wrapper.out'))) + +test.run(arguments = 'b' + _exe, + stderr=TestSCons.noisy_ar, + match=TestSCons.match_re_dotall) + +test.fail_test(test.read('wrapper.out') != "wrapper.py\n") + +test.pass_test() diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py new file mode 100644 index 0000000..cf46559 --- /dev/null +++ b/test/AR/ARCOM.py @@ -0,0 +1,66 @@ +#!/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 $ARCOM construction variable. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('myar.py', """ +import sys +outfile = open(sys.argv[1], 'wb') +for f in sys.argv[2:]: + infile = open(f, 'rb') + for l in filter(lambda l: l != '/*ar*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'ar'], + ARCOM = r'%s myar.py $TARGET $SOURCES', + LIBPREFIX = '', + LIBSUFFIX = '.lib') +env.Library(target = 'output', source = ['file.1', 'file.2']) +""" % python) + +test.write('file.1', "file.1\n/*ar*/\n") +test.write('file.2', "file.2\n/*ar*/\n") + +test.run(arguments = '.') + +test.must_match('output.lib', "file.1\nfile.2\n") + + + +test.pass_test() diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py new file mode 100644 index 0000000..933a4e1 --- /dev/null +++ b/test/AR/ARCOMSTR.py @@ -0,0 +1,70 @@ +#!/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 $ARCOMSTR construction variable allows you to customize +the displayed archiver string. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('myar.py', """ +import sys +outfile = open(sys.argv[1], 'wb') +for f in sys.argv[2:]: + infile = open(f, 'rb') + for l in filter(lambda l: l != '/*ar*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'ar'], + ARCOM = r'%s myar.py $TARGET $SOURCES', + ARCOMSTR = 'Archiving $TARGET from $SOURCES', + LIBPREFIX = '', + LIBSUFFIX = '.lib') +env.Library(target = 'output', source = ['file.1', 'file.2']) +""" % python) + +test.write('file.1', "file.1\n/*ar*/\n") +test.write('file.2', "file.2\n/*ar*/\n") + +test.run(stdout = test.wrap_stdout("""\ +Archiving output.lib from file.1 file.2 +""")) + +test.must_match('output.lib', "file.1\nfile.2\n") + + + +test.pass_test() diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py new file mode 100644 index 0000000..9a7e274 --- /dev/null +++ b/test/AR/ARFLAGS.py @@ -0,0 +1,97 @@ +#!/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() + +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(LIBS = ['foo'], LIBPATH = ['.']) +bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], + AR = '', ARFLAGS = foo.subst(r'%s wrapper.py $AR $ARFLAGS')) +foo.Library(target = 'foo', source = 'foo.c') +bar.Library(target = 'bar', source = 'bar.c') + +obj = foo.Object('main', 'main.c') + +foo.Program(target = 'f', source = obj) +bar.Program(target = 'b', source = obj) +""" % python) + +test.write('foo.c', r""" +void +library_function(void) +{ + printf("foo.c\n"); +} +""") + +test.write('bar.c', r""" +void +library_function(void) +{ + printf("bar.c\n"); +} +""") + +test.write('main.c', r""" +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + library_function(); + exit (0); +} +""") + + +test.run(arguments = 'f' + _exe, + stderr=TestSCons.noisy_ar, + match=TestSCons.match_re_dotall) + +test.fail_test(os.path.exists(test.workpath('wrapper.out'))) + +test.run(arguments = 'b' + _exe, + stderr=TestSCons.noisy_ar, + match=TestSCons.match_re_dotall) + +test.fail_test(test.read('wrapper.out') != "wrapper.py\n") + +test.pass_test() diff --git a/test/ARFLAGS.py b/test/ARFLAGS.py deleted file mode 100644 index 9a7e274..0000000 --- a/test/ARFLAGS.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/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() - -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(LIBS = ['foo'], LIBPATH = ['.']) -bar = Environment(LIBS = ['bar'], LIBPATH = ['.'], - AR = '', ARFLAGS = foo.subst(r'%s wrapper.py $AR $ARFLAGS')) -foo.Library(target = 'foo', source = 'foo.c') -bar.Library(target = 'bar', source = 'bar.c') - -obj = foo.Object('main', 'main.c') - -foo.Program(target = 'f', source = obj) -bar.Program(target = 'b', source = obj) -""" % python) - -test.write('foo.c', r""" -void -library_function(void) -{ - printf("foo.c\n"); -} -""") - -test.write('bar.c', r""" -void -library_function(void) -{ - printf("bar.c\n"); -} -""") - -test.write('main.c', r""" -int -main(int argc, char *argv[]) -{ - argv[argc++] = "--"; - library_function(); - exit (0); -} -""") - - -test.run(arguments = 'f' + _exe, - stderr=TestSCons.noisy_ar, - match=TestSCons.match_re_dotall) - -test.fail_test(os.path.exists(test.workpath('wrapper.out'))) - -test.run(arguments = 'b' + _exe, - stderr=TestSCons.noisy_ar, - match=TestSCons.match_re_dotall) - -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") - -test.pass_test() diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py new file mode 100644 index 0000000..da47618 --- /dev/null +++ b/test/AS/ASPP.py @@ -0,0 +1,139 @@ +#!/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 = [], + ASPP = r'%s myas.py', + CC = r'%s myas.py') +env.Program(target = 'test1', source = 'test1.spp') +env.Program(target = 'test2', source = 'test2.SPP') +""" % (python, python, python)) + +test.write('test1.spp', r"""This is a .spp file. +#as +#link +""") + +test.write('test2.SPP', r"""This is a .SPP file. +#as +#link +""") + +test.run(arguments = '.', stderr = None) + +test.fail_test(test.read('test1' + _exe) != "This is a .spp file.\n") + +test.fail_test(test.read('test2' + _exe) != "This is a .SPP file.\n") + + + +test.pass_test() diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py new file mode 100644 index 0000000..e877354 --- /dev/null +++ b/test/AS/ASPPCOM.py @@ -0,0 +1,68 @@ +#!/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 $ASPPCOM 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) +""") + +test.write('SConstruct', """ +env = Environment(ASPPCOM = r'%(python)s myas.py $TARGET $SOURCE', + OBJSUFFIX = '.obj') +env.Object(target = 'test1', source = 'test1.spp') +env.Object(target = 'test2', source = 'test2.SPP') +""" % locals()) + +test.write('test1.spp', "test1.spp\n#as\n") +test.write('test2.SPP', "test2.SPP\n#as\n") + +test.run(arguments = '.') + +test.fail_test(test.read('test1.obj') != "test1.spp\n") +test.fail_test(test.read('test2.obj') != "test2.SPP\n") + + + +test.pass_test() diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py new file mode 100644 index 0000000..21e8033 --- /dev/null +++ b/test/AS/ASPPCOMSTR.py @@ -0,0 +1,73 @@ +#!/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 $ASPPCOMSTR construction variable allows you to customize +the displayed assembler string. +""" + +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) +""") + +test.write('SConstruct', """ +env = Environment(ASPPCOM = r'%(python)s myas.py $TARGET $SOURCE', + ASPPCOMSTR = 'Assembling $TARGET from $SOURCE', + OBJSUFFIX = '.obj') +env.Object(target = 'test1', source = 'test1.spp') +env.Object(target = 'test2', source = 'test2.SPP') +""" % locals()) + +test.write('test1.spp', "test1.spp\n#as\n") +test.write('test2.SPP', "test2.SPP\n#as\n") + +test.run(stdout = test.wrap_stdout("""\ +Assembling test1.obj from test1.spp +Assembling test2.obj from test2.SPP +""")) + +test.fail_test(test.read('test1.obj') != "test1.spp\n") +test.fail_test(test.read('test2.obj') != "test2.SPP\n") + + + +test.pass_test() diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py new file mode 100644 index 0000000..cbd4339 --- /dev/null +++ b/test/AS/ASPPFLAGS.py @@ -0,0 +1,152 @@ +#!/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'%(python)s mylink.py', + LINKFLAGS = [], + ASPP = r'%(python)s myas.py', ASPPFLAGS = '-x', + CC = r'%(python)s myas.py') +env.Program(target = 'test1', source = 'test1.spp') +env.Program(target = 'test2', source = 'test2.SPP') +""" % locals()) + +test.write('test1.spp', r"""This is a .spp file. +#as +#link +""") + +test.write('test2.SPP', r"""This is a .SPP file. +#as +#link +""") + +test.run(arguments = '.', stderr = None) + +test.must_match('test1' + _exe, "%s\nThis is a .spp file.\n" % o_c) +test.must_match('test2' + _exe, "%s\nThis is a .SPP file.\n" % o_c) + +test.pass_test() -- cgit v0.12