From: Feng, Bob C Date: Tue, 13 Aug 2019 04:09:17 +0000 (+0800) Subject: BaseTools: Fix incremental build bug X-Git-Tag: edk2-stable201908~101 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=a000d5d1cac3a3df329e26877ad181a632b4e6ed;p=mirror_edk2.git BaseTools: Fix incremental build bug https://bugzilla.tianocore.org/show_bug.cgi?id=2078 This is a build tool regression issue that is introduced by multiple-process-autogen. The workspace timestamp value is not pass to module autogen object correctly, so build tool does not detect the change of .dsc and ignore the autogen. This patch is to fix this issue. Cc: Liming Gao Signed-off-by: Bob Feng Reviewed-by: Liming Gao Tested-by: Michael D Kinney --- diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py index ed6822334e..0654b11ad8 100644 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -218,7 +218,7 @@ class ModuleAutoGen(AutoGen): EdkLogger.debug(EdkLogger.DEBUG_9, "AutoGen module [%s] [%s]" % (ModuleFile, Arch)) GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (ModuleFile, Arch, Toolchain, Target) - self.Workspace = None + self.Workspace = Workspace self.WorkspaceDir = "" self.PlatformInfo = None self.DataPipe = DataPipe @@ -255,7 +255,6 @@ class ModuleAutoGen(AutoGen): def __init_platform_info__(self): pinfo = self.DataPipe.Get("P_Info") - self.Workspace = WorkSpaceInfo(pinfo.get("WorkspaceDir"),pinfo.get("ActivePlatform"),pinfo.get("Target"),pinfo.get("ToolChain"),pinfo.get("ArchList")) self.WorkspaceDir = pinfo.get("WorkspaceDir") self.PlatformInfo = PlatformInfo(self.Workspace,pinfo.get("ActivePlatform"),pinfo.get("Target"),pinfo.get("ToolChain"),pinfo.get("Arch"),self.DataPipe) ## hash() operator of ModuleAutoGen