Sync EDKII BaseTools to BaseTools project r2042.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10850 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -751,7 +751,7 @@ class FdfParser:
|
||||
raise Warning("Value %s is not a number", self.FileName, Line)
|
||||
|
||||
for Profile in AllMacroList:
|
||||
if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:
|
||||
if Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:
|
||||
if Op == None:
|
||||
if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':
|
||||
return False
|
||||
|
@@ -80,7 +80,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
#
|
||||
|
||||
PathClassObj = PathClass(self.InfFileName, GenFdsGlobalVariable.WorkSpaceDir)
|
||||
ErrorCode, ErrorInfo = PathClassObj.Validate()
|
||||
ErrorCode, ErrorInfo = PathClassObj.Validate(".inf")
|
||||
if ErrorCode != 0:
|
||||
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
|
||||
|
||||
@@ -343,7 +343,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
if len(PlatformArchList) == 0:
|
||||
self.InDsc = False
|
||||
PathClassObj = PathClass(self.InfFileName, GenFdsGlobalVariable.WorkSpaceDir)
|
||||
ErrorCode, ErrorInfo = PathClassObj.Validate()
|
||||
ErrorCode, ErrorInfo = PathClassObj.Validate(".inf")
|
||||
if ErrorCode != 0:
|
||||
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
|
||||
if len(ArchList) == 1:
|
||||
|
@@ -172,6 +172,7 @@ def main():
|
||||
|
||||
"""call Workspace build create database"""
|
||||
os.environ["WORKSPACE"] = Workspace
|
||||
FdfParser.InputMacroDict["WORKSPACE"] = Workspace
|
||||
BuildWorkSpace = WorkspaceDatabase(':memory:', FdfParser.InputMacroDict)
|
||||
BuildWorkSpace.InitDatabase()
|
||||
|
||||
|
Reference in New Issue
Block a user