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/GenFds | |
| 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/GenFds')
| -rw-r--r-- | BaseTools/Source/Python/GenFds/AprioriSection.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FdfParser.py | 4 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FfsInfStatement.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/GenFds.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/OptRomInfStatement.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py index 7cf792b5b2..6b81b42620 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -21,7 +21,7 @@ import StringIO import FfsFileStatement
from GenFdsGlobalVariable import GenFdsGlobalVariable
from CommonDataClass.FdfClass import AprioriSectionClassObject
-from Common.String import *
+from Common.StringUtils import *
from Common.Misc import SaveFileOnChange,PathClass
from Common import EdkLogger
from Common.BuildToolError import *
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index 4518d8f2af..ddc5c930d4 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -48,12 +48,12 @@ from GenFdsGlobalVariable import GenFdsGlobalVariable from Common.BuildToolError import *
from Common import EdkLogger
from Common.Misc import PathClass
-from Common.String import NormPath
+from Common.StringUtils import NormPath
import Common.GlobalData as GlobalData
from Common.Expression import *
from Common import GlobalData
from Common.DataType import *
-from Common.String import ReplaceMacro
+from Common.StringUtils import ReplaceMacro
import uuid
from Common.Misc import tdict
from Common.MultipleWorkspace import MultipleWorkspace as mws
diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index c332eee607..b26821b290 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -29,7 +29,7 @@ import RuleSimpleFile import RuleComplexFile
from CommonDataClass.FdfClass import FfsInfStatementClassObject
from Common.MultipleWorkspace import MultipleWorkspace as mws
-from Common.String import *
+from Common.StringUtils import *
from Common.Misc import PathClass
from Common.Misc import GuidStructureByteArrayToGuidString
from Common.Misc import ProcessDuplicatedInf
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index f0b51e25df..339b998673 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -32,7 +32,7 @@ import Common.ToolDefClassObject as ToolDefClassObject from Common.DataType import *
import Common.GlobalData as GlobalData
from Common import EdkLogger
-from Common.String import *
+from Common.StringUtils import *
from Common.Misc import DirCache, PathClass
from Common.Misc import SaveFileOnChange
from Common.Misc import ClearDuplicatedInf
diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py index a865ac4436..79891b3b82 100644 --- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py +++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py @@ -22,7 +22,7 @@ import OptionRom import Common.GlobalData as GlobalData
from Common.DataType import *
-from Common.String import *
+from Common.StringUtils import *
from FfsInfStatement import FfsInfStatement
from GenFdsGlobalVariable import GenFdsGlobalVariable
|