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>
---
 BaseTools/Source/Python/build/BuildReport.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 58595d6..b2cc6ee 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1724,11 +1724,17 @@ class FdRegionReport(object):
 
         if self.Type == "FV":
             FvTotalSize = 0
             FvTakenSize = 0
             FvFreeSize  = 0
-            FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")
+            if not os.path.isfile(FvName):
+                FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")
+            else:
+                if FvName.upper().endswith('.FV'):
+                    FvReportFileName = FvName + ".txt"
+                else:
+                    FvReportFileName = FvName + ".Fv.txt"
             try:
                 #
                 # Collect size info in the firmware volume.
                 #
                 FvReport = open(FvReportFileName).read()
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

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

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Wednesday, February 28, 2018 11:11 AM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] 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>
>---
> BaseTools/Source/Python/build/BuildReport.py | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/build/BuildReport.py
>b/BaseTools/Source/Python/build/BuildReport.py
>index 58595d6..b2cc6ee 100644
>--- a/BaseTools/Source/Python/build/BuildReport.py
>+++ b/BaseTools/Source/Python/build/BuildReport.py
>@@ -1724,11 +1724,17 @@ class FdRegionReport(object):
>
>         if self.Type == "FV":
>             FvTotalSize = 0
>             FvTakenSize = 0
>             FvFreeSize  = 0
>-            FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")
>+            if not os.path.isfile(FvName):
>+                FvReportFileName = os.path.join(self._FvDir, FvName + ".Fv.txt")
>+            else:
>+                if FvName.upper().endswith('.FV'):
>+                    FvReportFileName = FvName + ".txt"
>+                else:
>+                    FvReportFileName = FvName + ".Fv.txt"
>             try:
>                 #
>                 # Collect size info in the firmware volume.
>                 #
>                 FvReport = open(FvReportFileName).read()
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel