Re: [Patch 1/3] BaseTools: Fixed a build report issue.

["Gao, Liming" <liming.gao@intel.com>]

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

> -----Original Message-----
> From: Feng, Bob C
> Sent: Monday, February 4, 2019 2:48 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [Patch 1/3] BaseTools: Fixed a build report issue.
> 
> Generate report fail when -Y EXECUTION_ORDER in build command.
> This patch is going to fix this issue.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/Eot/EotMain.py       | 3 ++-
>  BaseTools/Source/Python/build/BuildReport.py | 8 ++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
> index fd4bee6f90..57f96c89c9 100644
> --- a/BaseTools/Source/Python/Eot/EotMain.py
> +++ b/BaseTools/Source/Python/Eot/EotMain.py
> @@ -19,11 +19,12 @@ import Common.LongFilePathOs as os, time, glob  import Common.EdkLogger as EdkLogger  import
> Eot.EotGlobalData as EotGlobalData  from optparse import OptionParser  from Common.StringUtils import NormPath  from Common
> import BuildToolError -from Common.Misc import GuidStructureStringToGuidString, sdict
> +from Common.Misc import GuidStructureStringToGuidString from
> +collections import OrderedDict as sdict
>  from Eot.Parser import *
>  from Eot.InfParserLite import EdkInfParser  from Common.StringUtils import GetSplitValueList  from Eot import c  from Eot import
> Database diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
> index e457660fce..52764a6c55 100644
> --- a/BaseTools/Source/Python/build/BuildReport.py
> +++ b/BaseTools/Source/Python/build/BuildReport.py
> @@ -1650,18 +1650,18 @@ class PredictionReport(object):
>          #
>          SourceList = os.path.join(self._EotDir, "SourceFile.txt")
>          GuidList = os.path.join(self._EotDir, "GuidList.txt")
>          DispatchList = os.path.join(self._EotDir, "Dispatch.txt")
> 
> -        TempFile = open(SourceList, "w+")
> +        TempFile = []
>          for Item in self._SourceList:
>              FileWrite(TempFile, Item)
> -        TempFile.close()
> -        TempFile = open(GuidList, "w+")
> +        SaveFileOnChange(SourceList, "".join(TempFile), False)
> +        TempFile = []
>          for Key in self._GuidMap:
>              FileWrite(TempFile, "%s %s" % (Key, self._GuidMap[Key]))
> -        TempFile.close()
> +        SaveFileOnChange(GuidList, "".join(TempFile), False)
> 
>          try:
>              from Eot.EotMain import Eot
> 
>              #
> --
> 2.18.0.windows.1