[Patch 1/1] BaseTools: Fix incremental build bug

[Patch 1/1] BaseTools: Fix incremental build bug

[Bob Feng]

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 <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index ed6822334e93..0654b11ad8e4 100644
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -216,11 +216,11 @@ class ModuleAutoGen(AutoGen):
     #
     def _InitWorker(self, Workspace, ModuleFile, Target, Toolchain, Arch, PlatformFile,DataPipe):
         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
         self.__init_platform_info__()
         self.MetaFile = ModuleFile
@@ -253,11 +253,10 @@ class ModuleAutoGen(AutoGen):
         self.ReferenceModules = []
         self.ConstPcd                  = {}
 
     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
     #
     #  The module file path and arch string will be used to represent
-- 
2.20.1.windows.1

Re: [Patch 1/1] BaseTools: Fix incremental build bug

[Liming Gao]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Feng, Bob C
>Sent: Tuesday, August 13, 2019 12:12 PM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [Patch 1/1] 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 <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
>b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
>index ed6822334e93..0654b11ad8e4 100644
>--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
>@@ -216,11 +216,11 @@ class ModuleAutoGen(AutoGen):
>     #
>     def _InitWorker(self, Workspace, ModuleFile, Target, Toolchain, Arch,
>PlatformFile,DataPipe):
>         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
>         self.__init_platform_info__()
>         self.MetaFile = ModuleFile
>@@ -253,11 +253,10 @@ class ModuleAutoGen(AutoGen):
>         self.ReferenceModules = []
>         self.ConstPcd                  = {}
>
>     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
>     #
>     #  The module file path and arch string will be used to represent
>--
>2.20.1.windows.1

Re: [edk2-devel] [Patch 1/1] BaseTools: Fix incremental build bug

[Michael D Kinney]

Bob,

I have verified that the shell is rebuilt correctly when
the number of NULL lib instances are changed.

Tested-by: Michael D Kinney <michael.d.kinney@intel.com>

Mike

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io]
> On Behalf Of Bob Feng
> Sent: Monday, August 12, 2019 9:12 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C
> <bob.c.feng@intel.com>
> Subject: [edk2-devel] [Patch 1/1] 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 <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git
> a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> index ed6822334e93..0654b11ad8e4 100644
> --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> @@ -216,11 +216,11 @@ class ModuleAutoGen(AutoGen):
>      #
>      def _InitWorker(self, Workspace, ModuleFile, Target,
> Toolchain, Arch, PlatformFile,DataPipe):
>          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
>          self.__init_platform_info__()
>          self.MetaFile = ModuleFile
> @@ -253,11 +253,10 @@ class ModuleAutoGen(AutoGen):
>          self.ReferenceModules = []
>          self.ConstPcd                  = {}
> 
>      def __init_platform_info__(self):
>          pinfo = self.DataPipe.Get("P_Info")
> -        self.Workspace =
> WorkSpaceInfo(pinfo.get("WorkspaceDir"),pinfo.get("Active
> Platform"),pinfo.get("Target"),pinfo.get("ToolChain"),pin
> fo.get("ArchList"))
>          self.WorkspaceDir = pinfo.get("WorkspaceDir")
>          self.PlatformInfo =
> PlatformInfo(self.Workspace,pinfo.get("ActivePlatform"),p
> info.get("Target"),pinfo.get("ToolChain"),pinfo.get("Arch
> "),self.DataPipe)
>      ## hash() operator of ModuleAutoGen
>      #
>      #  The module file path and arch string will be used
> to represent
> --
> 2.20.1.windows.1
> 
> 
>