diff options
| author | Steven Knight <knight@baldmt.com> | 2008-11-12 00:12:33 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-11-12 00:12:33 (GMT) |
| commit | 15db335ece77ada6b53c75266d1b9d6f0d2c7c5b (patch) | |
| tree | 47c799f57b59ae5ce18ec20d99d6f1c95f0001c8 /bin/sconsexamples.py | |
| parent | f26a39c4d6bd123f3a8bb9834fb82cf6d9033c18 (diff) | |
| download | SCons-15db335ece77ada6b53c75266d1b9d6f0d2c7c5b.zip SCons-15db335ece77ada6b53c75266d1b9d6f0d2c7c5b.tar.gz SCons-15db335ece77ada6b53c75266d1b9d6f0d2c7c5b.tar.bz2 | |
Merged revisions 3225-3226 via svnmerge from
http://scons.tigris.org/svn/scons/branches/sgk_subst
........
r3225 | stevenknight | 2008-07-18 10:46:49 -0700 (Fri, 18 Jul 2008) | 3 lines
Remove an unnecessary \n from the end of the $INSTALLSTR setting (unneeded
because string substituion currently strips trailing white space).
........
r3226 | stevenknight | 2008-07-19 07:17:10 -0700 (Sat, 19 Jul 2008) | 3 lines
Use subst_list() for generating ToolSurrogate *COMSTR values so we don't
rely on the current white-space compression behavior of subst().
........
Diffstat (limited to 'bin/sconsexamples.py')
| -rw-r--r-- | bin/sconsexamples.py | 6 |
1 files changed, 5 insertions, 1 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): |