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>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index e4359c50150cc035a07ceec4765a6448db481a31..56aa48d2a1145f6038c42c618c4a5085344f9aec 100644 (file)
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -21,7 +21,8 @@ import Eot.EotGlobalData as EotGlobalData
 from optparse import OptionParser\r
 from Common.StringUtils import NormPath\r
 from Common import BuildToolError\r
-from Common.Misc import GuidStructureStringToGuidString, sdict\r
+from Common.Misc import GuidStructureStringToGuidString\r
+from collections import OrderedDict as sdict\r
 from Eot.Parser import *\r
 from Eot.InfParserLite import EdkInfParser\r
 from Common.StringUtils import GetSplitValueList\r

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 0b98d62cb6aa0cf2b945dd3b0d80c0b160a4261f..13b04acb7572771641ef5280560838ca0a825110 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1652,14 +1652,14 @@ class PredictionReport(object):
         GuidList = os.path.join(self._EotDir, "GuidList.txt")\r
         DispatchList = os.path.join(self._EotDir, "Dispatch.txt")\r
 \r
-        TempFile = open(SourceList, "w+")\r
+        TempFile = []\r
         for Item in self._SourceList:\r
             FileWrite(TempFile, Item)\r
-        TempFile.close()\r
-        TempFile = open(GuidList, "w+")\r
+        SaveFileOnChange(SourceList, "".join(TempFile), False)\r
+        TempFile = []\r
         for Key in self._GuidMap:\r
             FileWrite(TempFile, "%s %s" % (Key, self._GuidMap[Key]))\r
-        TempFile.close()\r
+        SaveFileOnChange(GuidList, "".join(TempFile), False)\r
 \r
         try:\r
             from Eot.EotMain import Eot\r