From 40db176d9d4f214e590488ba836f42382cc02cb4 Mon Sep 17 00:00:00 2001 From: "Shi, Steven" Date: Tue, 27 Aug 2019 13:16:46 +0800 Subject: [PATCH] BaseTools: Support more file types in build cache 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 Reviewed-by: Liming Gao --- .../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 f610365f6d..3bb7e91154 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)