From 6aa93f460a8b1fc830449d90e46430eb0fffe803 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Sun, 30 Oct 2011 00:44:18 +0000 Subject: [PATCH] fixed file name with Chinese encoding issue, which is merged from chaos.proton@gmail.com. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1779 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- tools/building.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/building.py b/tools/building.py index 56675060b..5cf225428 100644 --- a/tools/building.py +++ b/tools/building.py @@ -11,6 +11,7 @@ BuildOptions = {} Projects = [] Rtt_Root = '' Env = None +fs_encoding = sys.getfilesystemencoding() def _get_filetype(fn): if fn.rfind('.c') != -1 or fn.rfind('.C') != -1 or fn.rfind('.cpp') != -1: @@ -122,7 +123,7 @@ def IARAddGroup(parent, name, files, project_path): file = SubElement(group, 'file') file_name = SubElement(file, 'name') - file_name.text = '$PROJ_DIR$\\' + path + file_name.text = ('$PROJ_DIR$\\' + path).decode(fs_encoding) iar_workspace = ''' @@ -221,12 +222,12 @@ def MDK4AddGroup(ProjectFiles, parent, name, files, project_path): if ProjectFiles.count(name): name = basename + '_' + name ProjectFiles.append(name) - file_name.text = name + file_name.text = name.decode(fs_encoding) file_type = SubElement(file, 'FileType') file_type.text = '%d' % _get_filetype(name) file_path = SubElement(file, 'FilePath') - file_path.text = path + file_path.text = path.decode(fs_encoding) def MDK4Project(target, script): project_path = os.path.dirname(os.path.abspath(target)) -- GitLab