diff options
| -rw-r--r-- | doc/man/scons.1 | 18 | ||||
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Defaults.py | 4 | ||||
| -rw-r--r-- | test/LEX/LEX.py (renamed from test/LEX.py) | 0 | ||||
| -rw-r--r-- | test/LEX/LEXCOM.py | 66 | ||||
| -rw-r--r-- | test/LEX/LEXCOMSTR.py | 71 | ||||
| -rw-r--r-- | test/LEX/LEXFLAGS.py (renamed from test/LEXFLAGS.py) | 0 | ||||
| -rw-r--r-- | test/YACC/YACC.py (renamed from test/YACC.py) | 0 | ||||
| -rw-r--r-- | test/YACC/YACCCOM.py | 66 | ||||
| -rw-r--r-- | test/YACC/YACCCOMSTR.py | 71 | ||||
| -rw-r--r-- | test/YACC/YACCFLAGS.py (renamed from test/YACCFLAGS.py) | 0 |
11 files changed, 297 insertions, 4 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 511dbac..6c11a6e 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -5500,6 +5500,15 @@ General options passed to the lexical analyzer generator. The command line used to call the lexical analyzer generator to generate a source file. +.IP LEXCOMSTR +The string displayed when generating a source file +using the lexical analyzer generator. +If this is not set, then $LEXCOM (the command line) is displayed. + +.ES +env = Environment(LEXCOMSTR = "Lex'ing $TARGET from $SOURCES") +.EE + .IP _LIBDIRFLAGS An automatically-generated construction variable containing the linker command-line options @@ -6622,6 +6631,15 @@ The parser generator. The command line used to call the parser generator to generate a source file. +.IP YACCCOMSTR +The string displayed when generating a source file +using the parser generator. +If this is not set, then $YACCCOM (the command line) is displayed. + +.ES +env = Environment(YACCCOMSTR = "Yacc'ing $TARGET from $SOURCES") +.EE + .IP YACCFLAGS General options passed to the parser generator. If $YACCFLAGS contains a \-d option, diff --git a/src/CHANGES.txt b/src/CHANGES.txt index de6502c..d89d29c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -131,8 +131,9 @@ RELEASE 0.97 - XXX source file names. - Support easier configurability of what's displayed by various default - actions through new construction variables: $ASCOMSTR, $CCCOMSTR, - $CXXCOMSTR, $LINKCOMSTR, $SHCCCOMSTR and $SHCXXCOMSTR, $SHLINKCOMSTR. + actions by adding new construction variables: $ASCOMSTR, $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 45e09e6..6f90f5b 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -134,8 +134,8 @@ ShLinkAction = SCons.Action.Action("$SHLINKCOM", "$SHLINKCOMSTR") ArAction = SCons.Action.Action("$ARCOM") -LexAction = SCons.Action.Action("$LEXCOM") -YaccAction = SCons.Action.Action("$YACCCOM") +LexAction = SCons.Action.Action("$LEXCOM", "$LEXCOMSTR") +YaccAction = SCons.Action.Action("$YACCCOM", "$YACCCOMSTR") ProgScan = SCons.Scanner.Prog.ProgScan() diff --git a/test/LEX.py b/test/LEX/LEX.py index 3f596fb..3f596fb 100644 --- a/test/LEX.py +++ b/test/LEX/LEX.py diff --git a/test/LEX/LEXCOM.py b/test/LEX/LEXCOM.py new file mode 100644 index 0000000..ea4626d --- /dev/null +++ b/test/LEX/LEXCOM.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 $LEXCOM construction variable. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('mylex.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 != '/*lex*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'lex'], + LEXCOM = r'%s mylex.py $TARGET $SOURCES') +env.CFile(target = 'aaa', source = 'aaa.l') +env.CFile(target = 'bbb', source = 'bbb.lex') +""" % python) + +test.write('aaa.l', "aaa.l\n/*lex*/\n") +test.write('bbb.lex', "bbb.lex\n/*lex*/\n") + +test.run(arguments = '.') + +test.must_match('aaa.c', "aaa.l\n") +test.must_match('bbb.c', "bbb.lex\n") + + + +test.pass_test() diff --git a/test/LEX/LEXCOMSTR.py b/test/LEX/LEXCOMSTR.py new file mode 100644 index 0000000..5b01df7 --- /dev/null +++ b/test/LEX/LEXCOMSTR.py @@ -0,0 +1,71 @@ +#!/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 $LEXCOMSTR construction variable allows you to customize +the displayed string when lex is called. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('mylex.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 != '/*lex*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'lex'], + LEXCOM = r'%s mylex.py $TARGET $SOURCES', + LEXCOMSTR = 'Lexing $TARGET from $SOURCE') +env.CFile(target = 'aaa', source = 'aaa.l') +env.CFile(target = 'bbb', source = 'bbb.lex') +""" % python) + +test.write('aaa.l', "aaa.l\n/*lex*/\n") +test.write('bbb.lex', "bbb.lex\n/*lex*/\n") + +test.run(stdout = test.wrap_stdout("""\ +Lexing aaa.c from aaa.l +Lexing bbb.c from bbb.lex +""")) + +test.must_match('aaa.c', "aaa.l\n") +test.must_match('bbb.c', "bbb.lex\n") + + + +test.pass_test() diff --git a/test/LEXFLAGS.py b/test/LEX/LEXFLAGS.py index ba440da..ba440da 100644 --- a/test/LEXFLAGS.py +++ b/test/LEX/LEXFLAGS.py diff --git a/test/YACC.py b/test/YACC/YACC.py index 062e4bc..062e4bc 100644 --- a/test/YACC.py +++ b/test/YACC/YACC.py diff --git a/test/YACC/YACCCOM.py b/test/YACC/YACCCOM.py new file mode 100644 index 0000000..5f7cd38 --- /dev/null +++ b/test/YACC/YACCCOM.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 $YACCCOM construction variable. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('myyacc.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 != '/*yacc*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'yacc'], + YACCCOM = r'%s myyacc.py $TARGET $SOURCES') +env.CFile(target = 'aaa', source = 'aaa.y') +env.CFile(target = 'bbb', source = 'bbb.yacc') +""" % python) + +test.write('aaa.y', "aaa.y\n/*yacc*/\n") +test.write('bbb.yacc', "bbb.yacc\n/*yacc*/\n") + +test.run(arguments = '.') + +test.must_match('aaa.c', "aaa.y\n") +test.must_match('bbb.c', "bbb.yacc\n") + + + +test.pass_test() diff --git a/test/YACC/YACCCOMSTR.py b/test/YACC/YACCCOMSTR.py new file mode 100644 index 0000000..cfb48b7 --- /dev/null +++ b/test/YACC/YACCCOMSTR.py @@ -0,0 +1,71 @@ +#!/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 $YACCCOMSTR construction variable allows you to customize +the displayed string when yacc is called. +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('myyacc.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 != '/*yacc*/\\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(tools=['default', 'yacc'], + YACCCOM = r'%s myyacc.py $TARGET $SOURCES', + YACCCOMSTR = 'Yaccing $TARGET from $SOURCE') +env.CFile(target = 'aaa', source = 'aaa.y') +env.CFile(target = 'bbb', source = 'bbb.yacc') +""" % python) + +test.write('aaa.y', "aaa.y\n/*yacc*/\n") +test.write('bbb.yacc', "bbb.yacc\n/*yacc*/\n") + +test.run(stdout = test.wrap_stdout("""\ +Yaccing aaa.c from aaa.y +Yaccing bbb.c from bbb.yacc +""")) + +test.must_match('aaa.c', "aaa.y\n") +test.must_match('bbb.c', "bbb.yacc\n") + + + +test.pass_test() diff --git a/test/YACCFLAGS.py b/test/YACC/YACCFLAGS.py index 022b238..022b238 100644 --- a/test/YACCFLAGS.py +++ b/test/YACC/YACCFLAGS.py |