BaseTools: Enhance FV info report file path to support absolute path

When generate build report, Tool will get the info like size, Fv Name,
etc from the xx.Fv.txt file and add these info into the build report.
This patch support the xx.Fv.txt to use absolute file path format since
user may provide specified FV path.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 58595d62b3ae21c137386e5612ddf98c2f43cda0..b2cc6eec0a41648f59353ab9c1914fa9ba8cc2b6 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1726,7 +1726,13 @@ class FdRegionReport(object):
             FvTotalSize = 0\r
             FvTakenSize = 0\r
             FvFreeSize  = 0\r
             FvTotalSize = 0\r
             FvTakenSize = 0\r
             FvFreeSize  = 0\r

-            FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")\r
+            if not os.path.isfile(FvName):\r
+                FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")\r
+            else:\r
+                if FvName.upper().endswith('.FV'):\r
+                    FvReportFileName = FvName + ".txt"\r
+                else:\r
+                    FvReportFileName = FvName + ".Fv.txt"\r

             try:\r
                 #\r
                 # Collect size info in the firmware volume.\r
             try:\r
                 #\r
                 # Collect size info in the firmware volume.\r