Restore the ability for _stripixes() to call a custom _concat() function in the construction environment.

4 files changed, 67 insertions, 2 deletions

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 262f670..d726e9f 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -3863,7 +3863,8 @@ This may or may not be set,
 depending on the specific C compiler being used.
 
 .IP _concat
-A function used to produce variables like $_CPPINCFLAGS. It takes five
+A function used to produce variables like $_CPPINCFLAGS. It takes
+four or five
 arguments: a prefix to concatenate onto each element, a list of
 elements, a suffix to concatenate onto each element, an environment
 for variable interpolation, and an optional function that will be
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0d6b43d..6c36cd4 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -34,6 +34,11 @@ RELEASE 0.95 - XXX
     values.  Previously, SCons would only use the values if all three
     were set in the registry.
 
+  From Scott Lystig Fritchie:
+
+  - Fix the ability to use a custom _concat() function in the
+    construction environment when calling _stripixes().
+
   From Steven Knight:
 
   - Fix EnsureSConsVersion() so it checks against the SCons version,
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index c75c7c7..569269e 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -186,12 +186,17 @@ def _concat(prefix, list, suffix, env, f=lambda x: x):
 
     return ret
 
-def _stripixes(prefix, list, suffix, stripprefix, stripsuffix, env, c=_concat):
+def _stripixes(prefix, list, suffix, stripprefix, stripsuffix, env, c=None):
     """This is a wrapper around _concat() that checks for the existence
     of prefixes or suffixes on list elements and strips them where it
     finds them.  This is used by tools (like the GNU linker) that need
     to turn something like 'libfoo.a' into '-lfoo'."""
     
+    if not callable(c):
+        if callable(env["_concat"]):
+            c = env["_concat"]
+        else:
+            c = _concat
     def f(list, sp=stripprefix, ss=stripsuffix):
         ret = []
         for l in list:
diff --git a/test/custom-concat.py b/test/custom-concat.py
new file mode 100644
index 0000000..987c12e
--- /dev/null
+++ b/test/custom-concat.py
@@ -0,0 +1,54 @@
+#!/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__"
+
+"""
+Verify that _stripixes() can use a custom _concat() function through
+the construction environment.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+def my_concat1(pref, list, suff, env, f=None):
+    if f:
+        list = f(list)
+    list = map(lambda x, p=pref, s=suff: 'my'+p+x+s+'1', list)
+    return list
+myflags = '${_stripixes(MYPREFIX, LIST, MYSUFFIX, STRIPPREFIX, STRIPSUFFIX, __env__)}'
+env1 = Environment(MYFLAGS=myflags, _concat = my_concat1,
+                   MYPREFIX='p', MYSUFFIX='s',
+                   STRIPPREFIX='xxx', STRIPSUFFIX='yyy',
+                   LIST=['a', 'xxxb', 'cyyy', 'd'])
+print env1.subst('$MYFLAGS')
+""")
+
+expect = test.wrap_stdout(read_str = "mypas1 mypbs1 mypcs1 mypds1\n",
+                          build_str = "scons: `.' is up to date.\n")
+test.run(arguments = '.', stdout = expect)
+
+test.pass_test()