[edk2-devel] [Patch][edk2-stable201908] BaseTools: fix an incremental build issue.

Liming Gao liming.gao at intel.com
Wed Aug 28 15:26:04 UTC 2019


Bob:
  This is the critical regression issue for the incremental build. I request to catch it in this stable tag 201908. 

  This patch corrects the behavior. Reviewed-by: Liming Gao <liming.gao at intel.com>

Thanks
Liming
> -----Original Message-----
> From: Feng, Bob C
> Sent: Wednesday, August 28, 2019 4:52 PM
> To: devel at edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng at intel.com>; Gao, Liming <liming.gao at intel.com>; Shi, Steven <steven.shi at intel.com>
> Subject: [Patch][edk2-stable201908] BaseTools: fix an incremental build issue.
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2137
> 
> This patch is going to fix a regression issue of incremental
> build which was introduced by the commit 94459080c.
> The changing on INF file will not trigger module rebuild.
> 
> Signed-off-by: Bob Feng <bob.c.feng at intel.com>
> Cc: Liming Gao <liming.gao at intel.com>
> Cc: Steven Shi <steven.shi at intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> index 2cd0d3859e..f610365f6d 100755
> --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> @@ -1764,16 +1764,12 @@ class ModuleAutoGen(AutoGen):
>              for f in self.AutoGenDepSet:
>                  FileSet.add (f.Path)
> 
>              if os.path.exists (self.TimeStampPath):
>                  os.remove (self.TimeStampPath)
> -            with tempfile.NamedTemporaryFile('w+', dir=os.path.dirname(self.TimeStampPath), delete=False) as tf:
> -                for f in FileSet:
> -                    tf.write(f)
> -                    tf.write("\n")
> -                tempname = tf.name
> -            SaveFileOnChange(self.TimeStampPath, tempname, False)
> +
> +            SaveFileOnChange(self.TimeStampPath, "\n".join(FileSet), False)
> 
>          # Ignore generating makefile when it is a binary module
>          if self.IsBinaryModule:
>              return
> 
> --
> 2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#46545): https://edk2.groups.io/g/devel/message/46545
Mute This Topic: https://groups.io/mt/33055144/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list