From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 AA5362217CE24 for ; Wed, 6 Dec 2017 02:08:33 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Dec 2017 02:13:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,367,1508828400"; d="scan'208";a="184558098" Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by fmsmga006.fm.intel.com with ESMTP; 06 Dec 2017 02:13:04 -0800 From: Yonghong Zhu To: edk2-devel@lists.01.org Cc: Liming Gao Date: Wed, 6 Dec 2017 18:12:58 +0800 Message-Id: <1512555179-10976-3-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1512555179-10976-1-git-send-email-yonghong.zhu@intel.com> References: <1512555179-10976-1-git-send-email-yonghong.zhu@intel.com> Subject: [Patch 2/3] BaseTools: back up the binary files when hash value is same X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2017 10:08:33 -0000 We meet the case that first build with --hash option, then build it again with --hash and --binary-destination option, since the hash value is same, tool will not build the driver again, it cause the binary files are not backed up. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu --- BaseTools/Source/Python/AutoGen/AutoGen.py | 22 +++++++++++++++++----- BaseTools/Source/Python/build/build.py | 5 +++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 8ad385a..740bd4f 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -2706,21 +2706,21 @@ class ModuleAutoGen(AutoGen): # @param Target Build target (DEBUG, RELEASE) # @param Toolchain Name of tool chain # @param Arch The arch the module supports # @param PlatformFile Platform meta-file # - def _Init(self, Workspace, ModuleFile, Target, Toolchain, Arch, PlatformFile): + def _Init(self, Workspace, ModuleFile, Target, Toolchain, Arch, PlatformFile, Flag=False): EdkLogger.debug(EdkLogger.DEBUG_9, "AutoGen module [%s] [%s]" % (ModuleFile, Arch)) GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (ModuleFile, Arch, Toolchain, Target) self.Workspace = Workspace self.WorkspaceDir = Workspace.WorkspaceDir - + self.Flag = Flag self.MetaFile = ModuleFile self.PlatformInfo = PlatformAutoGen(Workspace, PlatformFile, Target, Toolchain, Arch) # check if this module is employed by active platform - if not self.PlatformInfo.ValidModule(self.MetaFile): + if not self.Flag and not self.PlatformInfo.ValidModule(self.MetaFile): EdkLogger.verbose("Module [%s] for [%s] is not employed by active platform\n" \ % (self.MetaFile, Arch)) return False self.SourceDir = self.MetaFile.SubDir @@ -2828,10 +2828,13 @@ class ModuleAutoGen(AutoGen): return self._FixedAtBuildPcds def _GetUniqueBaseName(self): BaseName = self.Name + # when self.Flag is true, the module is Asbuilt inf in the build output + if self.Flag: + return BaseName for Module in self.PlatformInfo.ModuleAutoGenList: if Module.MetaFile == self.MetaFile: continue if Module.Name == self.Name: if uuid.UUID(Module.Guid) == uuid.UUID(self.Guid): @@ -3836,11 +3839,17 @@ class ModuleAutoGen(AutoGen): fInputfile.close () return OutputName ## Create AsBuilt INF file the module # - def CreateAsBuiltInf(self): + def CreateAsBuiltInf(self, IsOnlyCopy = False): + self.OutputFile = [] + if IsOnlyCopy: + if GlobalData.gBinCacheDest: + self.CopyModuleToCache() + return + if self.IsAsBuiltInfCreated: return # Skip the following code for EDK I inf if self.AutoGenVersion < 0x00010005: @@ -3969,11 +3978,10 @@ class ModuleAutoGen(AutoGen): AsBuiltInfDict['module_uefi_specification_version'] += [self.Specification['UEFI_SPECIFICATION_VERSION']] if 'PI_SPECIFICATION_VERSION' in self.Specification: AsBuiltInfDict['module_pi_specification_version'] += [self.Specification['PI_SPECIFICATION_VERSION']] OutputDir = self.OutputDir.replace('\\', '/').strip('/') - self.OutputFile = [] for Item in self.CodaTargetList: File = Item.Target.Path.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/') if File not in self.OutputFile: self.OutputFile.append(File) if Item.Target.Ext.lower() == '.aml': @@ -4196,12 +4204,16 @@ class ModuleAutoGen(AutoGen): ModuleFile = path.join(self.OutputDir, self.Name + '.inf') if os.path.exists(HashFile): shutil.copy2(HashFile, FileDir) if os.path.exists(ModuleFile): shutil.copy2(ModuleFile, FileDir) + if not self.OutputFile: + Ma = ModuleAutoGen(self.Workspace, PathClass(ModuleFile), self.BuildTarget, self.ToolChain, self.Arch, self.Workspace.Platform.MetaFile, True) + self.OutputFile = Ma.BinaryFileList if self.OutputFile: for File in self.OutputFile: + File = str(File) if not os.path.isabs(File): File = os.path.join(self.OutputDir, File) if os.path.exists(File): shutil.copy2(File, FileDir) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index f94285a..457f6c9 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -823,10 +823,11 @@ class Build(): self.Platform = None self.ToolChainFamily = None self.LoadFixAddress = 0 self.UniFlag = BuildOptions.Flag self.BuildModules = [] + self.HashSkipModules = [] self.Db_Flag = False self.LaunchPrebuildFlag = False self.PlatformBuildPath = os.path.join(GlobalData.gConfDirectory,'.cache', '.PlatformBuild') if BuildOptions.CommandLength: GlobalData.gCommandMaxLength = BuildOptions.CommandLength @@ -2014,10 +2015,11 @@ class Build(): Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile) if Ma == None: continue if Ma.CanSkipbyHash(): + self.HashSkipModules.append(Ma) continue # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds' if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']: # for target which must generate AutoGen code and makefile @@ -2212,11 +2214,14 @@ class Build(): RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True) def CreateAsBuiltInf(self): for Module in self.BuildModules: Module.CreateAsBuiltInf() + for Module in self.HashSkipModules: + Module.CreateAsBuiltInf(True) self.BuildModules = [] + self.HashSkipModules = [] ## Do some clean-up works when error occurred def Relinquish(self): OldLogLevel = EdkLogger.GetLevel() EdkLogger.SetLevel(EdkLogger.ERROR) #self.DumpBuildData() -- 2.6.1.windows.1