From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Thu, 28 Apr 2016 06:42:26 +0000 (+0800)
Subject: BaseTools: fix the bug for FMP to support use Macro as path description
X-Git-Tag: edk2-stable201903~7205
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=35217a337cb6d262d4a3b5165bd86ba150a6c088

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 72fb3dc56e..39f951a035 100644
--- 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)
         
         AnyFileName = self.__Token
-        AnyFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(AnyFileName)
-        if not os.path.exists(AnyFileName):
-            raise Warning("File %s not exists"%AnyFileName, self.FileName, self.CurrentLineNumber)
+        self.__VerifyFile(AnyFileName)
+
         return AnyFileName
 
     ## __GetAnyFileStatement() method