diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sconsexamples.py | 6 | ||||
| -rw-r--r-- | bin/sconsoutput.py | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bin/sconsexamples.py b/bin/sconsexamples.py index 5fbdc41..ac8dce3 100644 --- a/bin/sconsexamples.py +++ b/bin/sconsexamples.py @@ -156,6 +156,7 @@ Prompt = { # command output. Stdin = """\ +import string import SCons.Defaults platform = '%s' @@ -176,7 +177,10 @@ class Curry: return apply(self.fun, self.pending + args, kw) def Str(target, source, env, cmd=""): - return env.subst(cmd, target=target, source=source) + result = [] + for cmd in env.subst_list(cmd, target=target, source=source): + result.append(string.join(map(str, cmd))) + return string.join(result, '\\n') class ToolSurrogate: def __init__(self, tool, variable, func): diff --git a/bin/sconsoutput.py b/bin/sconsoutput.py index 536bcea..ecc816c 100644 --- a/bin/sconsoutput.py +++ b/bin/sconsoutput.py @@ -238,7 +238,10 @@ class Curry: return apply(self.fun, self.pending + args, kw) def Str(target, source, env, cmd=""): - return env.subst(cmd, target=target, source=source) + result = [] + for cmd in env.subst_list(cmd, target=target, source=source): + result.append(string.join(map(str, cmd))) + return string.join(result, '\\n') class ToolSurrogate: def __init__(self, tool, variable, func, varlist): |