diff options
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Action.py | 14 | ||||
| -rw-r--r-- | test/Install/non-ascii-name.py | 54 |
3 files changed, 67 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a95ae82..97fb063 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,6 +18,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE embed manifests in Windows EXEs and DLLs. From Gary Oberbrunner: + - Fix unicode error when using non-ASCII filenames with Copy or Install - Put RPATH in LINKCOM rather than LINKFLAGS so resetting LINKFLAGS doesn't kill RPATH - Fix precompiled headers on Windows when variant dir name has spaces. diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 0dc5c2d..6909a9a 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -503,7 +503,18 @@ class _ActionAction(ActionBase): SCons.Util.AddMethod(self, batch_key, 'batch_key') def print_cmd_line(self, s, target, source, env): - sys.stdout.write(s + u"\n") + # In python 3, and in some of our tests, sys.stdout is + # a String io object, and it takes unicode strings only + # In other cases it's a regular Python 2.x file object + # which takes strings (bytes), and if you pass those a + # unicode object they try to decode with 'ascii' codec + # which fails if the cmd line has any hi-bit-set chars. + # This code assumes s is a regular string, but should + # work if it's unicode too. + try: + sys.stdout.write(unicode(s + "\n")) + except UnicodeDecodeError: + sys.stdout.write(s + "\n") def __call__(self, target, source, env, exitstatfunc=_null, @@ -660,7 +671,6 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw): kw['env'] = new_env try: - #FUTURE return subprocess.Popen(cmd, **kw) return subprocess.Popen(cmd, **kw) except EnvironmentError, e: if error == 'raise': raise diff --git a/test/Install/non-ascii-name.py b/test/Install/non-ascii-name.py new file mode 100644 index 0000000..0e2ee24 --- /dev/null +++ b/test/Install/non-ascii-name.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +#!/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 the Install() Builder works +""" + +import os.path +import time + +import TestSCons + +test = TestSCons.TestSCons() + +test.write('中文.txt', """\ +test stuff here in file 中文.txt. +""") + +test.write('SConstruct', """\ +InstallAs("b", Glob("*.txt")) +""") +test.run(arguments = '.') + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: |