Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-07-12 13:43:34 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-07-12 15:19:34 (GMT) |
| commit | ac6840211564d59c106cf4ab2cf0206e26996440 (patch) | |
| tree | 1ea215656b20db4eb2b35417e4cd9f9f1425760b | |
| parent | 37a83e858dd3724608c2c5265336e466fcd23e84 (diff) | |
| download | swift-ac6840211564d59c106cf4ab2cf0206e26996440.zip swift-ac6840211564d59c106cf4ab2cf0206e26996440.tar.bz2 | |
Fix SCons --tree= generation for unicode nodes.
Change-Id: I92c2ea1f5d50f53c1ec7df740af106e9b28a62c2
| -rw-r--r-- | 3rdParty/SCons/01_fix_tree.diff | 22 | ||||
| -rw-r--r-- | 3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py | 4 |
2 files changed, 24 insertions, 2 deletions
diff --git a/3rdParty/SCons/01_fix_tree.diff b/3rdParty/SCons/01_fix_tree.diff new file mode 100644 index 0000000..13aa8f2 --- /dev/null +++ b/3rdParty/SCons/01_fix_tree.diff @@ -0,0 +1,22 @@ +diff --git a/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py b/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py +index a9b3421..45278fa 100644 +--- a/scons-local-2.0.0.final.0/SCons/Util.py ++++ b/scons-local-2.0.0.final.0/SCons/Util.py +@@ -179,7 +179,7 @@ def render_tree(root, child_func, prune=0, margin=[0], visited={}): + or in the whole tree if prune. + """ + +- rname = str(root) ++ rname = repr(str(root)) + + children = child_func(root) + retval = "" +@@ -223,7 +223,7 @@ def print_tree(root, child_func, prune=0, showtags=0, margin=[0], visited={}): + or in the whole tree if prune. + """ + +- rname = str(root) ++ rname = repr(str(root)) + + if showtags: + diff --git a/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py b/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py index a9b3421..45278fa 100644 --- a/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py +++ b/3rdParty/SCons/scons-local-2.0.0.final.0/SCons/Util.py @@ -179,7 +179,7 @@ def render_tree(root, child_func, prune=0, margin=[0], visited={}): or in the whole tree if prune. """ - rname = str(root) + rname = repr(str(root)) children = child_func(root) retval = "" @@ -223,7 +223,7 @@ def print_tree(root, child_func, prune=0, showtags=0, margin=[0], visited={}): or in the whole tree if prune. """ - rname = str(root) + rname = repr(str(root)) if showtags: |