From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: steven.shi@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Mon, 26 Aug 2019 22:16:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Aug 2019 22:16:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,436,1559545200"; d="scan'208";a="380785127" Received: from jshi19-mobl.ccr.corp.intel.com ([10.254.208.27]) by fmsmga006.fm.intel.com with ESMTP; 26 Aug 2019 22:16:54 -0700 From: "Steven Shi" To: devel@edk2.groups.io Cc: liming.gao@intel.com, bob.c.feng@intel.com, "Shi, Steven" Subject: [PATCH] BaseTools: Support more file types in build cache Date: Tue, 27 Aug 2019 13:16:46 +0800 Message-Id: <20190827051646.4100-1-steven.shi@intel.com> X-Mailer: git-send-email 2.17.1.windows.2 From: "Shi, Steven" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1958 Current build cache does not store and restore all types file of Hii/vfr, version and dpx. This patch adds more file types to support them in build cache. Cc: Liming Gao Cc: Bob Feng Signed-off-by: Steven Shi --- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index 2cd0d3859e..4f17dee9a4 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -1267,29 +1267,30 @@ class ModuleAutoGen(AutoGen): @cached_property def OutputFile(self): retVal = set() + OutputDir = self.OutputDir.replace('\\', '/').strip('/') DebugDir = self.DebugDir.replace('\\', '/').strip('/') - FfsOutputDir = self.FfsOutputDir.replace('\\', '/').rstrip('/') for Item in self.CodaTargetList: File = Item.Target.Path.replace('\\', '/').strip('/').replace(DebugDir, '').replace(OutputDir, '').strip('/') - retVal.add(File) - if self.DepexGenerated: - retVal.add(self.Name + '.depex') + NewFile = path.join(self.OutputDir, File) + retVal.add(NewFile) Bin = self._GenOffsetBin() if Bin: - retVal.add(Bin) + NewFile = path.join(self.OutputDir, Bin) + retVal.add(NewFile) - for Root, Dirs, Files in os.walk(OutputDir): + for Root, Dirs, Files in os.walk(self.OutputDir): for File in Files: - if File.lower().endswith('.pdb'): - retVal.add(File) + # lib file is already added through above CodaTargetList, skip it here + if not (File.lower().endswith('.obj') or File.lower().endswith('.lib')): + NewFile = path.join(self.OutputDir, File) + retVal.add(NewFile) - for Root, Dirs, Files in os.walk(FfsOutputDir): + for Root, Dirs, Files in os.walk(self.FfsOutputDir): for File in Files: - if File.lower().endswith('.ffs') or File.lower().endswith('.offset') or File.lower().endswith('.raw') \ - or File.lower().endswith('.raw.txt'): - retVal.add(File) + NewFile = path.join(self.FfsOutputDir, File) + retVal.add(NewFile) return retVal @@ -1659,15 +1660,8 @@ class ModuleAutoGen(AutoGen): Ma = self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain] self.OutputFile = Ma.Binaries for File in self.OutputFile: - File = str(File) - if not os.path.isabs(File): - NewFile = os.path.join(self.OutputDir, File) - if not os.path.exists(NewFile): - NewFile = os.path.join(self.FfsOutputDir, File) - File = NewFile if os.path.exists(File): - if File.lower().endswith('.ffs') or File.lower().endswith('.offset') or File.lower().endswith('.raw') \ - or File.lower().endswith('.raw.txt'): + if File.startswith(os.path.abspath(self.FfsOutputDir)+os.sep): self.CacheCopyFile(FfsDir, self.FfsOutputDir, File) else: self.CacheCopyFile(FileDir, self.OutputDir, File) -- 2.17.1