BaseTools/build/build: delete variable
delete the shared global variable from Common.Misc delete the uncalled users of the variable from build.build Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
committed by
Feng, Bob C
parent
3aaacb2daf
commit
f30e4aed99
@ -54,9 +54,6 @@ secReGeneral = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? +([.
|
|||||||
|
|
||||||
StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')
|
StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')
|
||||||
|
|
||||||
## Dictionary used to store file time stamp for quick re-access
|
|
||||||
gFileTimeStampCache = {} # {file path : file time stamp}
|
|
||||||
|
|
||||||
## Dictionary used to store dependencies of files
|
## Dictionary used to store dependencies of files
|
||||||
gDependencyDatabase = {} # arch : {file path : [dependent files list]}
|
gDependencyDatabase = {} # arch : {file path : [dependent files list]}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# build a platform or a module
|
# build a platform or a module
|
||||||
#
|
#
|
||||||
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
|
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
|
||||||
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
|
# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
|
||||||
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>
|
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>
|
||||||
#
|
#
|
||||||
# This program and the accompanying materials
|
# This program and the accompanying materials
|
||||||
@ -72,43 +72,6 @@ gToolsDefinition = "tools_def.txt"
|
|||||||
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')
|
TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')
|
||||||
TmpTableDict = {}
|
TmpTableDict = {}
|
||||||
|
|
||||||
## Make a Python object persistent on file system
|
|
||||||
#
|
|
||||||
# @param Data The object to be stored in file
|
|
||||||
# @param File The path of file to store the object
|
|
||||||
#
|
|
||||||
def _DataDump(Data, File):
|
|
||||||
Fd = None
|
|
||||||
try:
|
|
||||||
Fd = open(File, 'wb')
|
|
||||||
pickle.dump(Data, Fd, pickle.HIGHEST_PROTOCOL)
|
|
||||||
except:
|
|
||||||
EdkLogger.error("", FILE_OPEN_FAILURE, ExtraData=File, RaiseError=False)
|
|
||||||
finally:
|
|
||||||
if Fd is not None:
|
|
||||||
Fd.close()
|
|
||||||
|
|
||||||
## Restore a Python object from a file
|
|
||||||
#
|
|
||||||
# @param File The path of file stored the object
|
|
||||||
#
|
|
||||||
# @retval object A python object
|
|
||||||
# @retval None If failure in file operation
|
|
||||||
#
|
|
||||||
def _DataRestore(File):
|
|
||||||
Data = None
|
|
||||||
Fd = None
|
|
||||||
try:
|
|
||||||
Fd = open(File, 'rb')
|
|
||||||
Data = pickle.load(Fd)
|
|
||||||
except Exception as e:
|
|
||||||
EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e)))
|
|
||||||
Data = None
|
|
||||||
finally:
|
|
||||||
if Fd is not None:
|
|
||||||
Fd.close()
|
|
||||||
return Data
|
|
||||||
|
|
||||||
## Check environment PATH variable to make sure the specified tool is found
|
## Check environment PATH variable to make sure the specified tool is found
|
||||||
#
|
#
|
||||||
# If the tool is found in the PATH, then True is returned
|
# If the tool is found in the PATH, then True is returned
|
||||||
@ -2192,31 +2155,11 @@ class Build():
|
|||||||
def Relinquish(self):
|
def Relinquish(self):
|
||||||
OldLogLevel = EdkLogger.GetLevel()
|
OldLogLevel = EdkLogger.GetLevel()
|
||||||
EdkLogger.SetLevel(EdkLogger.ERROR)
|
EdkLogger.SetLevel(EdkLogger.ERROR)
|
||||||
#self.DumpBuildData()
|
|
||||||
Utils.Progressor.Abort()
|
Utils.Progressor.Abort()
|
||||||
if self.SpawnMode == True:
|
if self.SpawnMode == True:
|
||||||
BuildTask.Abort()
|
BuildTask.Abort()
|
||||||
EdkLogger.SetLevel(OldLogLevel)
|
EdkLogger.SetLevel(OldLogLevel)
|
||||||
|
|
||||||
def DumpBuildData(self):
|
|
||||||
CacheDirectory = os.path.dirname(GlobalData.gDatabasePath)
|
|
||||||
Utils.CreateDirectory(CacheDirectory)
|
|
||||||
Utils._DataDump(Utils.gFileTimeStampCache, os.path.join(CacheDirectory, "gFileTimeStampCache"))
|
|
||||||
Utils._DataDump(Utils.gDependencyDatabase, os.path.join(CacheDirectory, "gDependencyDatabase"))
|
|
||||||
|
|
||||||
def RestoreBuildData(self):
|
|
||||||
FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gFileTimeStampCache")
|
|
||||||
if Utils.gFileTimeStampCache == {} and os.path.isfile(FilePath):
|
|
||||||
Utils.gFileTimeStampCache = Utils._DataRestore(FilePath)
|
|
||||||
if Utils.gFileTimeStampCache is None:
|
|
||||||
Utils.gFileTimeStampCache = {}
|
|
||||||
|
|
||||||
FilePath = os.path.join(os.path.dirname(GlobalData.gDatabasePath), "gDependencyDatabase")
|
|
||||||
if Utils.gDependencyDatabase == {} and os.path.isfile(FilePath):
|
|
||||||
Utils.gDependencyDatabase = Utils._DataRestore(FilePath)
|
|
||||||
if Utils.gDependencyDatabase is None:
|
|
||||||
Utils.gDependencyDatabase = {}
|
|
||||||
|
|
||||||
def ParseDefines(DefineList=[]):
|
def ParseDefines(DefineList=[]):
|
||||||
DefineDict = {}
|
DefineDict = {}
|
||||||
if DefineList is not None:
|
if DefineList is not None:
|
||||||
@ -2440,7 +2383,6 @@ def Main():
|
|||||||
if not (MyBuild.LaunchPrebuildFlag and os.path.exists(MyBuild.PlatformBuildPath)):
|
if not (MyBuild.LaunchPrebuildFlag and os.path.exists(MyBuild.PlatformBuildPath)):
|
||||||
MyBuild.Launch()
|
MyBuild.Launch()
|
||||||
|
|
||||||
#MyBuild.DumpBuildData()
|
|
||||||
#
|
#
|
||||||
# All job done, no error found and no exception raised
|
# All job done, no error found and no exception raised
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user