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>
This commit is contained in:
Yonghong Zhu 2016-11-14 17:41:11 +08:00
parent f475f1e236
commit 94e4bcbb5e

View File

@ -54,7 +54,7 @@ from Common import GlobalData
from Common.String import ReplaceMacro from Common.String import ReplaceMacro
import uuid import uuid
from Common.Misc import tdict from Common.Misc import tdict
from Common.MultipleWorkspace import MultipleWorkspace as mws
import Common.LongFilePathOs as os import Common.LongFilePathOs as os
from Common.LongFilePathSupport import OpenLongFilePath as open from Common.LongFilePathSupport import OpenLongFilePath as open
from Capsule import EFI_CERT_TYPE_PKCS7_GUID from Capsule import EFI_CERT_TYPE_PKCS7_GUID
@ -3505,6 +3505,9 @@ class FdfParser:
AnyFileName = self.__Token AnyFileName = self.__Token
self.__VerifyFile(AnyFileName) self.__VerifyFile(AnyFileName)
if not os.path.isabs(AnyFileName):
AnyFileName = mws.join(GenFdsGlobalVariable.WorkSpaceDir, AnyFileName)
return AnyFileName return AnyFileName
## __GetAnyFileStatement() method ## __GetAnyFileStatement() method