BaseTools: fix the bug for FMP to support use Macro as path description

Fix the bug for FMP image to support to use Macro as path description,
eg: FILE DATA = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/test.efi

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

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 72fb3dc56e22bab0107195945b0844ad69a13c62..39f951a0351b8c85c8980a525f34f143c14e858b 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -3435,9 +3435,8 @@ class FdfParser:
             raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
         \r
         AnyFileName = self.__Token\r
-        AnyFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(AnyFileName)\r
-        if not os.path.exists(AnyFileName):\r
-            raise Warning("File %s not exists"%AnyFileName, self.FileName, self.CurrentLineNumber)\r
+        self.__VerifyFile(AnyFileName)\r
+\r
         return AnyFileName\r
 \r
     ## __GetAnyFileStatement() method\r