From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CA66E211B1107 for ; Thu, 24 Jan 2019 08:14:25 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2019 08:14:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,517,1539673200"; d="scan'208";a="121005834" Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.149]) by orsmga003.jf.intel.com with ESMTP; 24 Jan 2019 08:14:24 -0800 From: Jaben Carsey To: edk2-devel@lists.01.org Cc: Bob Feng , Liming Gao Date: Thu, 24 Jan 2019 08:14:21 -0800 Message-Id: <2c6e8317b7e20ff8410d229ffef4dbacba30343f.1548270790.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [Patch v1 4/4] BaseTools/build/build: delete variable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 delete the shared global variable from Common.Misc delete the uncalled users of the variable from build.build Cc: Bob Feng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Common/Misc.py | 3 - BaseTools/Source/Python/build/build.py | 60 +------------------- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index e8be8f866511..0b4dd7a7c162 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -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_]*$') -## Dictionary used to store file time stamp for quick re-access -gFileTimeStampCache = {} # {file path : file time stamp} - ## Dictionary used to store dependencies of files gDependencyDatabase = {} # arch : {file path : [dependent files list]} diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 44ad86b780da..e79949fa28f9 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2,7 +2,7 @@ # build a platform or a module # # Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.
# # This program and the accompanying materials @@ -72,43 +72,6 @@ gToolsDefinition = "tools_def.txt" TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$') 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 # # If the tool is found in the PATH, then True is returned @@ -2192,31 +2155,11 @@ class Build(): def Relinquish(self): OldLogLevel = EdkLogger.GetLevel() EdkLogger.SetLevel(EdkLogger.ERROR) - #self.DumpBuildData() Utils.Progressor.Abort() if self.SpawnMode == True: BuildTask.Abort() 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=[]): DefineDict = {} if DefineList is not None: @@ -2440,7 +2383,6 @@ def Main(): if not (MyBuild.LaunchPrebuildFlag and os.path.exists(MyBuild.PlatformBuildPath)): MyBuild.Launch() - #MyBuild.DumpBuildData() # # All job done, no error found and no exception raised # -- 2.16.2.windows.1