BaseTools: FILE DATA to support relative path under Multiple workspace

Fix the bug that FILE DATA to support relative path under Multiple
workspace.

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 f17a41f94df69ffe116f851c19d8889f753ba74e..29002837372c9f5f23b3d6bdc1e94840058ff1dd 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -54,7 +54,7 @@ from Common import GlobalData
 from Common.String import ReplaceMacro\r
 import uuid\r
 from Common.Misc import tdict\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 import Common.LongFilePathOs as os\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Capsule import EFI_CERT_TYPE_PKCS7_GUID\r
@@ -3505,6 +3505,9 @@ class FdfParser:
         AnyFileName = self.__Token\r
         self.__VerifyFile(AnyFileName)\r
 \r
+        if not os.path.isabs(AnyFileName):\r
+            AnyFileName = mws.join(GenFdsGlobalVariable.WorkSpaceDir, AnyFileName)\r
+\r
         return AnyFileName\r
 \r
     ## __GetAnyFileStatement() method\r