From ed117ec5bd99c6239b443014d4924b5784920a4d Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Mon, 15 Nov 2004 15:11:40 +0000 Subject: More command-line customization: , . --- doc/man/scons.1 | 22 +++++++- src/CHANGES.txt | 2 +- src/engine/SCons/Defaults.py | 4 +- test/CC/SHCC.py | 81 ++++++++++++++++++++++++++ test/CC/SHCCCOM.py | 80 ++++++++++++++++++++++++++ test/CC/SHCCCOMSTR.py | 86 ++++++++++++++++++++++++++++ test/CC/SHCCFLAGS.py | 132 +++++++++++++++++++++++++++++++++++++++++++ test/CXX/SHCXX.py | 85 ++++++++++++++++++++++++++++ test/CXX/SHCXXCOM.py | 81 ++++++++++++++++++++++++++ test/CXX/SHCXXCOMSTR.py | 86 ++++++++++++++++++++++++++++ test/CXX/SHCXXFLAGS.py | 132 +++++++++++++++++++++++++++++++++++++++++++ test/SHCC.py | 81 -------------------------- test/SHCCFLAGS.py | 132 ------------------------------------------- test/SHCXX.py | 85 ---------------------------- test/SHCXXFLAGS.py | 132 ------------------------------------------- 15 files changed, 786 insertions(+), 435 deletions(-) create mode 100644 test/CC/SHCC.py create mode 100644 test/CC/SHCCCOM.py create mode 100644 test/CC/SHCCCOMSTR.py create mode 100644 test/CC/SHCCFLAGS.py create mode 100644 test/CXX/SHCXX.py create mode 100644 test/CXX/SHCXXCOM.py create mode 100644 test/CXX/SHCXXCOMSTR.py create mode 100644 test/CXX/SHCXXFLAGS.py delete mode 100644 test/SHCC.py delete mode 100644 test/SHCCFLAGS.py delete mode 100644 test/SHCXX.py delete mode 100644 test/SHCXXFLAGS.py diff --git a/doc/man/scons.1 b/doc/man/scons.1 index b2ccd71..88dea7e 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -4533,7 +4533,7 @@ 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") +env = Environment(CCCOMSTR = "Compiling static object $TARGET") .EE .IP CCFLAGS @@ -4797,7 +4797,7 @@ 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") +env = Environment(CXXCOMSTR = "Compiling static object $TARGET") .EE .IP CXXFLAGS @@ -6240,6 +6240,15 @@ to a shared-library object file. Any options specified in the $SHCCFLAGS and $CPPFLAGS construction variables are included on this command line. +.IP SHCCCOMSTR +The string displayed when a C source file +is compiled to a shared object file. +If this is not set, then $SHCCCOM (the command line) is displayed. + +.ES +env = Environment(SHCCCOMSTR = "Compiling shared object $TARGET") +.EE + .IP SHCCFLAGS Options that are passed to the C compiler to generate shared-library objects. @@ -6253,6 +6262,15 @@ to a shared-library object file. Any options specified in the $SHCXXFLAGS and $CPPFLAGS construction variables are included on this command line. +.IP SHCXXCOMSTR +The string displayed when a C++ source file +is compiled to a shared object file. +If this is not set, then $SHCXXCOM (the command line) is displayed. + +.ES +env = Environment(SHCXXCOMSTR = "Compiling shared object $TARGET") +.EE + .IP SHCXXFLAGS Options that are passed to the C++ compiler to generate shared-library objects. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b84f25a..1eedb74 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. + $CXXCOMSTR, $SHCCCOMSTR and $SHCXXCOMSTR. From Wayne Lee: diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 05d0ad8..cff8bd9 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -122,9 +122,9 @@ del suffix # Actions for common languages. CAction = SCons.Action.Action("$CCCOM", "$CCCOMSTR") DAction = SCons.Action.Action("$DCOM") -ShCAction = SCons.Action.Action("$SHCCCOM") +ShCAction = SCons.Action.Action("$SHCCCOM", "$SHCCCOMSTR") CXXAction = SCons.Action.Action("$CXXCOM", "$CXXCOMSTR") -ShCXXAction = SCons.Action.Action("$SHCXXCOM") +ShCXXAction = SCons.Action.Action("$SHCXXCOM", "$SHCXXCOMSTR") ASAction = SCons.Action.Action("$ASCOM", "$ASCOMSTR") ASPPAction = SCons.Action.Action("$ASPPCOM") diff --git a/test/CC/SHCC.py b/test/CC/SHCC.py new file mode 100644 index 0000000..35296c7 --- /dev/null +++ b/test/CC/SHCC.py @@ -0,0 +1,81 @@ +#!/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() + +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() +shcc = foo.Dictionary('SHCC') +bar = Environment(SHCC = r'%s wrapper.py ' + shcc) +foo.SharedObject(target = 'foo/foo', source = 'foo.c') +bar.SharedObject(target = 'bar/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') + +test.fail_test(os.path.exists(test.workpath('wrapper.out'))) + +test.run(arguments = 'bar') + +test.fail_test(test.read('wrapper.out') != "wrapper.py\n") + +test.pass_test() diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py new file mode 100644 index 0000000..13cdaa8 --- /dev/null +++ b/test/CC/SHCCCOM.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__" + +import os +import string +import sys +import TestSCons + +""" +Test the ability to configure the $SHCCCOM construction variable. +""" + +python = TestSCons.python + +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(SHCCCOM = r'%(python)s mycc.py $TARGET $SOURCE', + SHOBJSUFFIX='.obj') +env.SharedObject(target = 'test1', source = 'test1.c') +env.SharedObject(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() diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py new file mode 100644 index 0000000..27e5cbc --- /dev/null +++ b/test/CC/SHCCCOMSTR.py @@ -0,0 +1,86 @@ +#!/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 $SHCCCOMSTR construction variable allows you to customize +the shared object 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(SHCCCOM = r'%(python)s mycc.py $TARGET $SOURCE', + SHCCCOMSTR = 'Building $TARGET from $SOURCE', + SHOBJSUFFIX='.obj') +env.SharedObject(target = 'test1', source = 'test1.c') +env.SharedObject(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() diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py new file mode 100644 index 0000000..610fcd1 --- /dev/null +++ b/test/CC/SHCCFLAGS.py @@ -0,0 +1,132 @@ +#!/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 sys +import TestSCons +import os +import string + +if sys.platform == 'win32': + fooflags = '/nologo -DFOO' + barflags = '/nologo -DBAR' +else: + fooflags = '-DFOO' + barflags = '-DBAR' + +test = TestSCons.TestSCons() + +if os.name == 'posix': + os.environ['LD_LIBRARY_PATH'] = '.' +if string.find(sys.platform, 'irix') > -1: + os.environ['LD_LIBRARYN32_PATH'] = '.' + +test.write('SConstruct', """ +foo = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) +bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) + +foo_obj = foo.SharedObject(target = 'foo', source = 'prog.c') +foo.SharedLibrary(target = 'foo', source = foo_obj) + +bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') +bar.SharedLibrary(target = 'bar', source = bar_obj) + +fooMain = foo.Copy(LIBS='foo', LIBPATH='.') +foomain_obj = fooMain.Object(target='foomain', source='main.c') +fooMain.Program(target='fooprog', source=foomain_obj) + +barMain = bar.Copy(LIBS='bar', LIBPATH='.') +barmain_obj = barMain.Object(target='barmain', source='main.c') +barMain.Program(target='barprog', source=barmain_obj) +""" % (fooflags, barflags)) + +test.write('foo.def', r""" +LIBRARY "foo" +DESCRIPTION "Foo Shared Library" + +EXPORTS + doIt +""") + +test.write('bar.def', r""" +LIBRARY "bar" +DESCRIPTION "Bar Shared Library" + +EXPORTS + doIt +""") + +test.write('prog.c', r""" +void +doIt() +{ +#ifdef FOO + printf("prog.c: FOO\n"); +#endif +#ifdef BAR + printf("prog.c: BAR\n"); +#endif +} +""") + +test.write('main.c', r""" + +void doIt(); + +int +main(int argc, char* argv[]) +{ + doIt(); + return 0; +} +""") + +test.run(arguments = '.') + +test.run(program = test.workpath('fooprog'), stdout = "prog.c: FOO\n") +test.run(program = test.workpath('barprog'), stdout = "prog.c: BAR\n") + +test.write('SConstruct', """ +bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) + +foo_obj = bar.SharedObject(target = 'foo', source = 'prog.c') +bar.SharedLibrary(target = 'foo', source = foo_obj) + +bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') +bar.SharedLibrary(target = 'bar', source = bar_obj) + +barMain = bar.Copy(LIBS='bar', LIBPATH='.') +foomain_obj = barMain.Object(target='foomain', source='main.c') +barmain_obj = barMain.Object(target='barmain', source='main.c') +barMain.Program(target='barprog', source=foomain_obj) +barMain.Program(target='fooprog', source=barmain_obj) +""" % (barflags)) + +test.run(arguments = '.') + +test.run(program = test.workpath('fooprog'), stdout = "prog.c: BAR\n") +test.run(program = test.workpath('barprog'), stdout = "prog.c: BAR\n") + +test.pass_test() diff --git a/test/CXX/SHCXX.py b/test/CXX/SHCXX.py new file mode 100644 index 0000000..a3c98c7 --- /dev/null +++ b/test/CXX/SHCXX.py @@ -0,0 +1,85 @@ +#!/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() + +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() +shcxx = foo.Dictionary('SHCXX') +bar = Environment(SHCXX = r'%s wrapper.py ' + shcxx) +foo.SharedObject(target = 'foo/foo', source = 'foo.cpp') +bar.SharedObject(target = 'bar/bar', source = 'bar.cpp') +""" % python) + +test.write('foo.cpp', r""" +#include +#include +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + printf("foo.c\n"); + exit (0); +} +""") + +test.write('bar.cpp', r""" +#include +#include +int +main(int argc, char *argv[]) +{ + argv[argc++] = "--"; + printf("foo.c\n"); + exit (0); +} +""") + + +test.run(arguments = 'foo') + +test.fail_test(os.path.exists(test.workpath('wrapper.out'))) + +test.run(arguments = 'bar') + +test.fail_test(test.read('wrapper.out') != "wrapper.py\n") + +test.pass_test() diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py new file mode 100644 index 0000000..1a38d71 --- /dev/null +++ b/test/CXX/SHCXXCOM.py @@ -0,0 +1,81 @@ +#!/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 $SHCXXCOM 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[:7] != '/*c++*/', infile.readlines()): + outfile.write(l) +sys.exit(0) +""") + +if os.path.normcase('.c') == os.path.normcase('.C'): + alt_cc_suffix = '.CC' +else: + alt_cc_suffix = '.cc' + +test.write('SConstruct', """ +env = Environment(SHCXXCOM = r'%(python)s mycc.py $TARGET $SOURCE', + SHOBJSUFFIX='.obj') +env.SharedObject(target = 'test1', source = 'test1.cc') +env.SharedObject(target = 'test2', source = 'test2%(alt_cc_suffix)s') +""" % locals()) + +test.write('test1.cc', """\ +test1.cc +/*c++*/ +""") + +test.write('test2'+alt_cc_suffix, """\ +test2.CC +/*c++*/ +""") + +test.run() + +test.must_match('test1.obj', "test1.cc\n") +test.must_match('test2.obj', "test2.CC\n") + + + +test.pass_test() diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py new file mode 100644 index 0000000..2c43393 --- /dev/null +++ b/test/CXX/SHCXXCOMSTR.py @@ -0,0 +1,86 @@ +#!/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 $SHCXXCOMSTR construction variable allows you to customize +the shared object 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_cc_suffix = '.CC' +else: + alt_cc_suffix = '.cc' + +test.write('SConstruct', """ +env = Environment(SHCXXCOM = r'%(python)s mycc.py $TARGET $SOURCE', + SHCXXCOMSTR = 'Building shared object $TARGET from $SOURCE', + SHOBJSUFFIX='.obj') +env.SharedObject(target = 'test1', source = 'test1.cc') +env.SharedObject(target = 'test2', source = 'test2%(alt_cc_suffix)s') +""" % locals()) + +test.write('test1.cc', """\ +test1.cc +/*cc*/ +""") + +test.write('test2'+alt_cc_suffix, """\ +test2.CC +/*cc*/ +""") + +test.run(stdout = test.wrap_stdout("""\ +Building shared object test1.obj from test1.cc +Building shared object test2.obj from test2%(alt_cc_suffix)s +""" % locals())) + +test.must_match('test1.obj', "test1.cc\n") +test.must_match('test2.obj', "test2.CC\n") + + + +test.pass_test() diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py new file mode 100644 index 0000000..38feca1 --- /dev/null +++ b/test/CXX/SHCXXFLAGS.py @@ -0,0 +1,132 @@ +#!/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 sys +import TestSCons +import os +import string + +if sys.platform == 'win32': + _obj = '.obj' + fooflags = '/nologo -DFOO' + barflags = '/nologo -DBAR' +else: + _obj = '.o' + fooflags = '-DFOO' + barflags = '-DBAR' + +if os.name == 'posix': + os.environ['LD_LIBRARY_PATH'] = '.' +if string.find(sys.platform, 'irix') > -1: + os.environ['LD_LIBRARYN32_PATH'] = '.' + +test = TestSCons.TestSCons() + +test.write('SConstruct', """ +foo = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) +bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) +foo.SharedObject(target = 'foo%s', source = 'prog.cpp') +bar.SharedObject(target = 'bar%s', source = 'prog.cpp') +foo.SharedLibrary(target = 'foo', source = 'foo%s') +bar.SharedLibrary(target = 'bar', source = 'bar%s') + +fooMain = foo.Copy(LIBS='foo', LIBPATH='.') +foo_obj = fooMain.Object(target='foomain', source='main.c') +fooMain.Program(target='fooprog', source=foo_obj) + +barMain = bar.Copy(LIBS='bar', LIBPATH='.') +bar_obj = barMain.Object(target='barmain', source='main.c') +barMain.Program(target='barprog', source=bar_obj) +""" % (fooflags, barflags, _obj, _obj, _obj, _obj)) + +test.write('foo.def', r""" +LIBRARY "foo" +DESCRIPTION "Foo Shared Library" + +EXPORTS + doIt +""") + +test.write('bar.def', r""" +LIBRARY "bar" +DESCRIPTION "Bar Shared Library" + +EXPORTS + doIt +""") + +test.write('prog.cpp', r""" +#include + +extern "C" void +doIt() +{ +#ifdef FOO + printf("prog.cpp: FOO\n"); +#endif +#ifdef BAR + printf("prog.cpp: BAR\n"); +#endif +} +""") + +test.write('main.c', r""" + +void doIt(); + +int +main(int argc, char* argv[]) +{ + doIt(); + return 0; +} +""") + +test.run(arguments = '.') + +test.run(program = test.workpath('fooprog'), stdout = "prog.cpp: FOO\n") +test.run(program = test.workpath('barprog'), stdout = "prog.cpp: BAR\n") + +test.write('SConstruct', """ +bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) +bar.SharedObject(target = 'foo%s', source = 'prog.cpp') +bar.SharedObject(target = 'bar%s', source = 'prog.cpp') +bar.SharedLibrary(target = 'foo', source = 'foo%s') +bar.SharedLibrary(target = 'bar', source = 'bar%s') + +barMain = bar.Copy(LIBS='bar', LIBPATH='.') +foo_obj = barMain.Object(target='foomain', source='main.c') +bar_obj = barMain.Object(target='barmain', source='main.c') +barMain.Program(target='barprog', source=foo_obj) +barMain.Program(target='fooprog', source=bar_obj) +""" % (barflags, _obj, _obj, _obj, _obj)) + +test.run(arguments = '.') + +test.run(program = test.workpath('fooprog'), stdout = "prog.cpp: BAR\n") +test.run(program = test.workpath('barprog'), stdout = "prog.cpp: BAR\n") + +test.pass_test() diff --git a/test/SHCC.py b/test/SHCC.py deleted file mode 100644 index 35296c7..0000000 --- a/test/SHCC.py +++ /dev/null @@ -1,81 +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 - -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() -shcc = foo.Dictionary('SHCC') -bar = Environment(SHCC = r'%s wrapper.py ' + shcc) -foo.SharedObject(target = 'foo/foo', source = 'foo.c') -bar.SharedObject(target = 'bar/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') - -test.fail_test(os.path.exists(test.workpath('wrapper.out'))) - -test.run(arguments = 'bar') - -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") - -test.pass_test() diff --git a/test/SHCCFLAGS.py b/test/SHCCFLAGS.py deleted file mode 100644 index 610fcd1..0000000 --- a/test/SHCCFLAGS.py +++ /dev/null @@ -1,132 +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 sys -import TestSCons -import os -import string - -if sys.platform == 'win32': - fooflags = '/nologo -DFOO' - barflags = '/nologo -DBAR' -else: - fooflags = '-DFOO' - barflags = '-DBAR' - -test = TestSCons.TestSCons() - -if os.name == 'posix': - os.environ['LD_LIBRARY_PATH'] = '.' -if string.find(sys.platform, 'irix') > -1: - os.environ['LD_LIBRARYN32_PATH'] = '.' - -test.write('SConstruct', """ -foo = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) -bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) - -foo_obj = foo.SharedObject(target = 'foo', source = 'prog.c') -foo.SharedLibrary(target = 'foo', source = foo_obj) - -bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') -bar.SharedLibrary(target = 'bar', source = bar_obj) - -fooMain = foo.Copy(LIBS='foo', LIBPATH='.') -foomain_obj = fooMain.Object(target='foomain', source='main.c') -fooMain.Program(target='fooprog', source=foomain_obj) - -barMain = bar.Copy(LIBS='bar', LIBPATH='.') -barmain_obj = barMain.Object(target='barmain', source='main.c') -barMain.Program(target='barprog', source=barmain_obj) -""" % (fooflags, barflags)) - -test.write('foo.def', r""" -LIBRARY "foo" -DESCRIPTION "Foo Shared Library" - -EXPORTS - doIt -""") - -test.write('bar.def', r""" -LIBRARY "bar" -DESCRIPTION "Bar Shared Library" - -EXPORTS - doIt -""") - -test.write('prog.c', r""" -void -doIt() -{ -#ifdef FOO - printf("prog.c: FOO\n"); -#endif -#ifdef BAR - printf("prog.c: BAR\n"); -#endif -} -""") - -test.write('main.c', r""" - -void doIt(); - -int -main(int argc, char* argv[]) -{ - doIt(); - return 0; -} -""") - -test.run(arguments = '.') - -test.run(program = test.workpath('fooprog'), stdout = "prog.c: FOO\n") -test.run(program = test.workpath('barprog'), stdout = "prog.c: BAR\n") - -test.write('SConstruct', """ -bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1) - -foo_obj = bar.SharedObject(target = 'foo', source = 'prog.c') -bar.SharedLibrary(target = 'foo', source = foo_obj) - -bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') -bar.SharedLibrary(target = 'bar', source = bar_obj) - -barMain = bar.Copy(LIBS='bar', LIBPATH='.') -foomain_obj = barMain.Object(target='foomain', source='main.c') -barmain_obj = barMain.Object(target='barmain', source='main.c') -barMain.Program(target='barprog', source=foomain_obj) -barMain.Program(target='fooprog', source=barmain_obj) -""" % (barflags)) - -test.run(arguments = '.') - -test.run(program = test.workpath('fooprog'), stdout = "prog.c: BAR\n") -test.run(program = test.workpath('barprog'), stdout = "prog.c: BAR\n") - -test.pass_test() diff --git a/test/SHCXX.py b/test/SHCXX.py deleted file mode 100644 index a3c98c7..0000000 --- a/test/SHCXX.py +++ /dev/null @@ -1,85 +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 - -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() -shcxx = foo.Dictionary('SHCXX') -bar = Environment(SHCXX = r'%s wrapper.py ' + shcxx) -foo.SharedObject(target = 'foo/foo', source = 'foo.cpp') -bar.SharedObject(target = 'bar/bar', source = 'bar.cpp') -""" % python) - -test.write('foo.cpp', r""" -#include -#include -int -main(int argc, char *argv[]) -{ - argv[argc++] = "--"; - printf("foo.c\n"); - exit (0); -} -""") - -test.write('bar.cpp', r""" -#include -#include -int -main(int argc, char *argv[]) -{ - argv[argc++] = "--"; - printf("foo.c\n"); - exit (0); -} -""") - - -test.run(arguments = 'foo') - -test.fail_test(os.path.exists(test.workpath('wrapper.out'))) - -test.run(arguments = 'bar') - -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") - -test.pass_test() diff --git a/test/SHCXXFLAGS.py b/test/SHCXXFLAGS.py deleted file mode 100644 index 38feca1..0000000 --- a/test/SHCXXFLAGS.py +++ /dev/null @@ -1,132 +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 sys -import TestSCons -import os -import string - -if sys.platform == 'win32': - _obj = '.obj' - fooflags = '/nologo -DFOO' - barflags = '/nologo -DBAR' -else: - _obj = '.o' - fooflags = '-DFOO' - barflags = '-DBAR' - -if os.name == 'posix': - os.environ['LD_LIBRARY_PATH'] = '.' -if string.find(sys.platform, 'irix') > -1: - os.environ['LD_LIBRARYN32_PATH'] = '.' - -test = TestSCons.TestSCons() - -test.write('SConstruct', """ -foo = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) -bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) -foo.SharedObject(target = 'foo%s', source = 'prog.cpp') -bar.SharedObject(target = 'bar%s', source = 'prog.cpp') -foo.SharedLibrary(target = 'foo', source = 'foo%s') -bar.SharedLibrary(target = 'bar', source = 'bar%s') - -fooMain = foo.Copy(LIBS='foo', LIBPATH='.') -foo_obj = fooMain.Object(target='foomain', source='main.c') -fooMain.Program(target='fooprog', source=foo_obj) - -barMain = bar.Copy(LIBS='bar', LIBPATH='.') -bar_obj = barMain.Object(target='barmain', source='main.c') -barMain.Program(target='barprog', source=bar_obj) -""" % (fooflags, barflags, _obj, _obj, _obj, _obj)) - -test.write('foo.def', r""" -LIBRARY "foo" -DESCRIPTION "Foo Shared Library" - -EXPORTS - doIt -""") - -test.write('bar.def', r""" -LIBRARY "bar" -DESCRIPTION "Bar Shared Library" - -EXPORTS - doIt -""") - -test.write('prog.cpp', r""" -#include - -extern "C" void -doIt() -{ -#ifdef FOO - printf("prog.cpp: FOO\n"); -#endif -#ifdef BAR - printf("prog.cpp: BAR\n"); -#endif -} -""") - -test.write('main.c', r""" - -void doIt(); - -int -main(int argc, char* argv[]) -{ - doIt(); - return 0; -} -""") - -test.run(arguments = '.') - -test.run(program = test.workpath('fooprog'), stdout = "prog.cpp: FOO\n") -test.run(program = test.workpath('barprog'), stdout = "prog.cpp: BAR\n") - -test.write('SConstruct', """ -bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1) -bar.SharedObject(target = 'foo%s', source = 'prog.cpp') -bar.SharedObject(target = 'bar%s', source = 'prog.cpp') -bar.SharedLibrary(target = 'foo', source = 'foo%s') -bar.SharedLibrary(target = 'bar', source = 'bar%s') - -barMain = bar.Copy(LIBS='bar', LIBPATH='.') -foo_obj = barMain.Object(target='foomain', source='main.c') -bar_obj = barMain.Object(target='barmain', source='main.c') -barMain.Program(target='barprog', source=foo_obj) -barMain.Program(target='fooprog', source=bar_obj) -""" % (barflags, _obj, _obj, _obj, _obj)) - -test.run(arguments = '.') - -test.run(program = test.workpath('fooprog'), stdout = "prog.cpp: BAR\n") -test.run(program = test.workpath('barprog'), stdout = "prog.cpp: BAR\n") - -test.pass_test() -- cgit v0.12