diff options
| author | Marvin.Haeuser@outlook.com <Marvin.Haeuser@outlook.com> | 2018-05-19 18:50:25 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-05-28 13:05:00 +0800 |
| commit | 5a57246eab80f00ae2481970d12a2abc345a2730 (patch) | |
| tree | 432ca762bf2573de78649b75065193d3840432ba /BaseTools/Source/Python/AutoGen | |
| parent | ba94c38f08734fa10143f44955c705ed9d14faf4 (diff) | |
| download | edk2-5a57246eab80f00ae2481970d12a2abc345a2730.tar.gz edk2-5a57246eab80f00ae2481970d12a2abc345a2730.tar.bz2 edk2-5a57246eab80f00ae2481970d12a2abc345a2730.zip | |
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>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenC.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenMake.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenPcdDb.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/IdfClassObject.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index cf58abf251..9a57b9abd9 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -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
diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py index dd6301b01f..ad1919442e 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -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
diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py index 40a343ca10..1be27d2b89 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -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 *
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index a373507422..6e83b3d73e 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -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
diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py index d2d42fe9d0..2e05b77e14 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -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
diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py index 769790d965..e5b933c203 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -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
diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py index 54b6fb22a0..5a3c254778 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -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 *
|