From fffa95494c5cd83ea06dbe5ccff4da5973df2820 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 15 Nov 2004 16:17:39 +0000 Subject: [PATCH] More command-line configurability: , . git-svn-id: http://scons.tigris.org/svn/scons/trunk@1164 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- doc/man/scons.1 | 20 +++++++ src/CHANGES.txt | 2 +- src/engine/SCons/Defaults.py | 4 +- test/{ => LINK}/LINK.py | 0 test/LINK/LINKCOM.py | 76 ++++++++++++++++++++++++++ test/LINK/LINKCOMSTR.py | 80 +++++++++++++++++++++++++++ test/{ => LINK}/LINKFLAGS.py | 0 test/{ => LINK}/SHLINK.py | 0 test/LINK/SHLINKCOM.py | 92 +++++++++++++++++++++++++++++++ test/LINK/SHLINKCOMSTR.py | 98 ++++++++++++++++++++++++++++++++++ test/{ => LINK}/SHLINKFLAGS.py | 0 11 files changed, 369 insertions(+), 3 deletions(-) rename test/{ => LINK}/LINK.py (100%) create mode 100644 test/LINK/LINKCOM.py create mode 100644 test/LINK/LINKCOMSTR.py rename test/{ => LINK}/LINKFLAGS.py (100%) rename test/{ => LINK}/SHLINK.py (100%) create mode 100644 test/LINK/SHLINKCOM.py create mode 100644 test/LINK/SHLINKCOMSTR.py rename test/{ => LINK}/SHLINKFLAGS.py (100%) diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 88dea7e4..511dbac0 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -5660,6 +5660,15 @@ for the variable that expands to library search path options. .IP LINKCOM The command line used to link object files into an executable. +.IP LINKCOMSTR +The string displayed when object files +are linked into an executable. +If this is not set, then $LINKCOM (the command line) is displayed. + +.ES +env = Environment(LINKCOMSTR = "Linking $TARGET") +.EE + .IP M4 The M4 macro preprocessor. @@ -6428,6 +6437,17 @@ The suffix used for shared library file names. .IP SHLINK The linker for programs that use shared libraries. +.IP SHLINKCOM +The command line used to link programs using shared libaries. + +.IP SHLINKCOMSTR +The string displayed when programs using shared libraries are linked. +If this is not set, then $SHLINKCOM (the command line) is displayed. + +.ES +env = Environment(SHLINKCOMSTR = "Linking shared $TARGET") +.EE + .IP SHLINKFLAGS General user options passed to the linker for programs using shared libraries. Note that this variable should diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 1eedb74d..de6502cf 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -132,7 +132,7 @@ RELEASE 0.97 - XXX - Support easier configurability of what's displayed by various default actions through new construction variables: $ASCOMSTR, $CCCOMSTR, - $CXXCOMSTR, $SHCCCOMSTR and $SHCXXCOMSTR. + $CXXCOMSTR, $LINKCOMSTR, $SHCCCOMSTR and $SHCXXCOMSTR, $SHLINKCOMSTR. From Wayne Lee: diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index cff8bd9b..45e09e65 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -129,8 +129,8 @@ ShCXXAction = SCons.Action.Action("$SHCXXCOM", "$SHCXXCOMSTR") ASAction = SCons.Action.Action("$ASCOM", "$ASCOMSTR") ASPPAction = SCons.Action.Action("$ASPPCOM") -LinkAction = SCons.Action.Action("$LINKCOM") -ShLinkAction = SCons.Action.Action("$SHLINKCOM") +LinkAction = SCons.Action.Action("$LINKCOM", "$LINKCOMSTR") +ShLinkAction = SCons.Action.Action("$SHLINKCOM", "$SHLINKCOMSTR") ArAction = SCons.Action.Action("$ARCOM") diff --git a/test/LINK.py b/test/LINK/LINK.py similarity index 100% rename from test/LINK.py rename to test/LINK/LINK.py diff --git a/test/LINK/LINKCOM.py b/test/LINK/LINKCOM.py new file mode 100644 index 00000000..c94d5e31 --- /dev/null +++ b/test/LINK/LINKCOM.py @@ -0,0 +1,76 @@ +#!/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 $LINKCOM construction variable. +""" + +import os +import string +import sys +import TestSCons + +python = TestSCons.python +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + + + +test.write('mylink.py', r""" +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 != '/*link*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(LINKCOM = r'%(python)s mylink.py $TARGET $SOURCES', + OBJSUFFIX = '.obj', + PROGSUFFIX = '.exe') +env.Program(target = 'test1', source = ['test1.obj', 'test2.obj']) +""" % locals()) + +test.write('test1.obj', """\ +test1.obj +/*link*/ +""") + +test.write('test2.obj', """\ +test2.obj +/*link*/ +""") + +test.run() + +test.must_match('test1.exe', "test1.obj\ntest2.obj\n") + + + +test.pass_test() diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py new file mode 100644 index 00000000..70b5c0c4 --- /dev/null +++ b/test/LINK/LINKCOMSTR.py @@ -0,0 +1,80 @@ +#!/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 $LINKCOMSTR construction variable allows you to customize +the displayed linker string. +""" + +import os +import string +import sys +import TestSCons + +python = TestSCons.python +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + + + +test.write('mylink.py', r""" +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 != '/*link*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(LINKCOM = r'%(python)s mylink.py $TARGET $SOURCES', + LINKCOMSTR = 'Linking $TARGET from $SOURCES', + OBJSUFFIX = '.obj', + PROGSUFFIX = '.exe') +env.Program(target = 'test1', source = ['test1.obj', 'test2.obj']) +""" % locals()) + +test.write('test1.obj', """\ +test1.obj +/*link*/ +""") + +test.write('test2.obj', """\ +test2.obj +/*link*/ +""") + +test.run(stdout = test.wrap_stdout("""\ +Linking test1.exe from test1.obj test2.obj +""")) + +test.must_match('test1.exe', "test1.obj\ntest2.obj\n") + + + +test.pass_test() diff --git a/test/LINKFLAGS.py b/test/LINK/LINKFLAGS.py similarity index 100% rename from test/LINKFLAGS.py rename to test/LINK/LINKFLAGS.py diff --git a/test/SHLINK.py b/test/LINK/SHLINK.py similarity index 100% rename from test/SHLINK.py rename to test/LINK/SHLINK.py diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py new file mode 100644 index 00000000..d97c4edb --- /dev/null +++ b/test/LINK/SHLINKCOM.py @@ -0,0 +1,92 @@ +#!/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 $SHLINKCOM construction variable. +""" + +import os +import string +import sys +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('mycc.py', r""" +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 != '/*cc*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) + +""") +test.write('mylink.py', r""" +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 != '/*link*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(SHCCCOM = r'%(python)s mycc.py $TARGET $SOURCES', + SHLINKCOM = r'%(python)s mylink.py $TARGET $SOURCES', + SHOBJSUFFIX = '.obj', + SHLIBPREFIX = '', + SHLIBSUFFIX = '.dll') +t1 = env.SharedObject('test1', 'test1.c') +t2 = env.SharedObject('test2', 'test2.c') +env.SharedLibrary(target = 'test3', source = [t1, t2]) +""" % locals()) + +test.write('test1.c', """\ +test1.c +/*cc*/ +/*link*/ +""") + +test.write('test2.c', """\ +test2.c +/*cc*/ +/*link*/ +""") + +test.run() + +test.must_match('test3.dll', "test1.c\ntest2.c\n") + + + + +test.pass_test() diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py new file mode 100644 index 00000000..1ea29b26 --- /dev/null +++ b/test/LINK/SHLINKCOMSTR.py @@ -0,0 +1,98 @@ +#!/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 $SHLINKCOMSTR construction variable allows you to customize +the displayed linker string for programs using shared libraries. +""" + +import os +import string +import sys +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + + + +test.write('mycc.py', r""" +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 != '/*cc*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) + +""") +test.write('mylink.py', r""" +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 != '/*link*/\n', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +test.write('SConstruct', """ +env = Environment(SHCCCOM = r'%(python)s mycc.py $TARGET $SOURCES', + SHLINKCOM = r'%(python)s mylink.py $TARGET $SOURCES', + SHLINKCOMSTR = 'Linking shared $TARGET from $SOURCES', + SHOBJSUFFIX = '.obj', + SHLIBPREFIX = '', + SHLIBSUFFIX = '.dll') +t1 = env.SharedObject('test1', 'test1.c') +t2 = env.SharedObject('test2', 'test2.c') +env.SharedLibrary(target = 'test3', source = [t1, t2]) +""" % locals()) + +test.write('test1.c', """\ +test1.c +/*cc*/ +/*link*/ +""") + +test.write('test2.c', """\ +test2.c +/*cc*/ +/*link*/ +""") + +test.run(stdout = test.wrap_stdout("""\ +%(python)s mycc.py test1.obj test1.c +%(python)s mycc.py test2.obj test2.c +Linking shared test3.dll from test1.obj test2.obj +""" % locals())) + +test.must_match('test3.dll', "test1.c\ntest2.c\n") + + + + +test.pass_test() diff --git a/test/SHLINKFLAGS.py b/test/LINK/SHLINKFLAGS.py similarity index 100% rename from test/SHLINKFLAGS.py rename to test/LINK/SHLINKFLAGS.py -- 2.26.2