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
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
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.
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.
- 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:
# 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")
--- /dev/null
+#!/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()
--- /dev/null
+#!/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()
--- /dev/null
+#!/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()
--- /dev/null
+#!/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()
projects / scons.git / commitdiff