tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools/UPT: UPT to Support UTF-8 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Hess Chen 2016-04-22 13:23:38 +08:00 committed by Yonghong Zhu
parent b739e14d7f
commit 4a21fb3b67
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BaseTools/Source/Python/UPT/Library/UniClassObject.py
View File

@ -1,7 +1,7 @@
## @file ## @file
# Collect all defined strings in multiple uni files. # Collect all defined strings in multiple uni files.
# #
# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are licensed and made available # This program and the accompanying materials are licensed and made available
# under the terms and conditions of the BSD License which accompanies this # under the terms and conditions of the BSD License which accompanies this
@ -328,6 +328,8 @@ class UniFileClassObject(object):
Lang = distutils.util.split_quoted((Line.split(u"//")[0])) Lang = distutils.util.split_quoted((Line.split(u"//")[0]))
if len(Lang) != 3: if len(Lang) != 3:
try: try:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').read()
except UnicodeError, Xstr:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').read() FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').read()
except UnicodeError, Xstr: except UnicodeError, Xstr:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').read() FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').read()
@ -430,11 +432,13 @@ class UniFileClassObject(object):
# #
# Check file header of the Uni file # Check file header of the Uni file
# #
if not CheckUTF16FileHeader(File.Path): # if not CheckUTF16FileHeader(File.Path):
EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, # EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID,
ExtraData='The file %s is either invalid UTF-16LE or it is missing the BOM.' % File.Path) # ExtraData='The file %s is either invalid UTF-16LE or it is missing the BOM.' % File.Path)
try: try:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').read()
except UnicodeError, Xstr:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines() FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines()
except UnicodeError: except UnicodeError:
FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines() FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines()
@ -1046,6 +1050,8 @@ class UniFileClassObject(object):
ToolError.FILE_NOT_FOUND, ToolError.FILE_NOT_FOUND,
ExtraData=FilaPath) ExtraData=FilaPath)
try: try:
FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_8').read()
except UnicodeError, Xstr:
FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines() FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines()
except UnicodeError: except UnicodeError:
FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines() FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines()