BaseTools: Rename String to StringUtils.
For case-insensitive file systems, edk2 String.py collides with the Python string.py, which results in build errors. This,for example, applies to building via the Windows Subsystem for Linux from a DriveFS file system. This patch renames String to StringUtils to prevent conflicts for case-insensitive file systems. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
committed by
Liming Gao
parent
ba94c38f08
commit
5a57246eab
@ -33,7 +33,7 @@ from Common.LongFilePathSupport import CopyLongFilePath
|
||||
from Common.BuildToolError import *
|
||||
from Common.DataType import *
|
||||
from Common.Misc import *
|
||||
from Common.String import *
|
||||
from Common.StringUtils import *
|
||||
import Common.GlobalData as GlobalData
|
||||
from GenFds.FdfParser import *
|
||||
from CommonDataClass.CommonClass import SkuInfoClass
|
||||
|
@ -23,7 +23,7 @@ from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.GlobalData import *
|
||||
from Common.BuildToolError import *
|
||||
from Common.Misc import tdict, PathClass
|
||||
from Common.String import NormPath
|
||||
from Common.StringUtils import NormPath
|
||||
from Common.DataType import *
|
||||
|
||||
import Common.EdkLogger as EdkLogger
|
||||
|
@ -21,7 +21,7 @@ from Common import EdkLogger
|
||||
from Common.BuildToolError import *
|
||||
from Common.DataType import *
|
||||
from Common.Misc import *
|
||||
from Common.String import StringToArray
|
||||
from Common.StringUtils import StringToArray
|
||||
from StrGather import *
|
||||
from GenPcdDb import CreatePcdDatabaseCode
|
||||
from IdfClassObject import *
|
||||
|
@ -22,7 +22,7 @@ from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.MultipleWorkspace import MultipleWorkspace as mws
|
||||
from Common.BuildToolError import *
|
||||
from Common.Misc import *
|
||||
from Common.String import *
|
||||
from Common.StringUtils import *
|
||||
from BuildEngine import *
|
||||
import Common.GlobalData as GlobalData
|
||||
from collections import OrderedDict
|
||||
|
@ -12,7 +12,7 @@
|
||||
#
|
||||
from StringIO import StringIO
|
||||
from Common.Misc import *
|
||||
from Common.String import StringToArray
|
||||
from Common.StringUtils import StringToArray
|
||||
from struct import pack
|
||||
from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER
|
||||
from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB
|
||||
|
@ -16,7 +16,7 @@
|
||||
import Common.EdkLogger as EdkLogger
|
||||
import StringIO
|
||||
from Common.BuildToolError import *
|
||||
from Common.String import GetLineNo
|
||||
from Common.StringUtils import GetLineNo
|
||||
from Common.Misc import PathClass
|
||||
from Common.LongFilePathSupport import LongFilePath
|
||||
import re
|
||||
|
@ -21,7 +21,7 @@ import distutils.util
|
||||
import Common.EdkLogger as EdkLogger
|
||||
import StringIO
|
||||
from Common.BuildToolError import *
|
||||
from Common.String import GetLineNo
|
||||
from Common.StringUtils import GetLineNo
|
||||
from Common.Misc import PathClass
|
||||
from Common.LongFilePathSupport import LongFilePath
|
||||
from Common.GlobalData import *
|
||||
|
Reference in New Issue
Block a user