Failed in applying to current master (
apply log)
BaseTools/Source/Python/AutoGen/AutoGen.py | 24 +--
BaseTools/Source/Python/AutoGen/BuildEngine.py | 23 +--
BaseTools/Source/Python/AutoGen/GenC.py | 13 +-
BaseTools/Source/Python/AutoGen/GenDepex.py | 3 +-
BaseTools/Source/Python/AutoGen/GenPcdDb.py | 15 +-
BaseTools/Source/Python/AutoGen/GenVar.py | 15 +-
BaseTools/Source/Python/Common/DataType.py | 2 +
BaseTools/Source/Python/GenFds/AprioriSection.py | 3 +-
BaseTools/Source/Python/GenFds/FdfParser.py | 29 ++--
BaseTools/Source/Python/GenFds/Ffs.py | 3 +-
BaseTools/Source/Python/GenFds/FfsInfStatement.py | 5 +-
BaseTools/Source/Python/GenFds/GenFds.py | 13 +-
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 9 +-
BaseTools/Source/Python/GenFds/Section.py | 3 +-
BaseTools/Source/Python/Workspace/DecBuildData.py | 5 +-
BaseTools/Source/Python/Workspace/DscBuildData.py | 173 ++++++++++----------
BaseTools/Source/Python/Workspace/InfBuildData.py | 9 +-
BaseTools/Source/Python/Workspace/MetaFileParser.py | 34 ++--
BaseTools/Source/Python/Workspace/MetaFileTable.py | 22 +--
BaseTools/Source/Python/Workspace/WorkspaceDatabase.py | 6 +-
BaseTools/Source/Python/build/BuildReport.py | 5 +-
21 files changed, 218 insertions(+), 196 deletions(-)