From c4f52e128fef070954e34e91fb4e9c458d9fc1e7 Mon Sep 17 00:00:00 2001 From: Li YangX Date: Thu, 8 Oct 2015 09:28:51 +0000 Subject: BaseTools: Update ECC tool to support multiple workspaces Update ECC to refer MultipleWorkspace class to convert the file path from WORKSPACE and PACKAGES_PATH. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Li YangX Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18581 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/Ecc/MetaDataParser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/Ecc/MetaDataParser.py') diff --git a/BaseTools/Source/Python/Ecc/MetaDataParser.py b/BaseTools/Source/Python/Ecc/MetaDataParser.py index d80a5cff5d..82ede3eb33 100644 --- a/BaseTools/Source/Python/Ecc/MetaDataParser.py +++ b/BaseTools/Source/Python/Ecc/MetaDataParser.py @@ -14,6 +14,7 @@ import Common.LongFilePathOs as os from CommonDataClass.DataClass import * from EccToolError import * +from Common.MultipleWorkspace import MultipleWorkspace as mws import EccGlobalData import re ## Get the inlcude path list for a source file @@ -33,8 +34,8 @@ def GetIncludeListOfFile(WorkSpace, Filepath, Db): % (MODEL_META_DATA_PACKAGE, MODEL_EFI_SOURCE_FILE, '\\', Filepath) RecordSet = Db.TblFile.Exec(SqlCommand) for Record in RecordSet: - DecFullPath = os.path.normpath(os.path.join(WorkSpace, Record[0])) - InfFullPath = os.path.normpath(os.path.join(WorkSpace, Record[1])) + DecFullPath = os.path.normpath(mws.join(WorkSpace, Record[0])) + InfFullPath = os.path.normpath(mws.join(WorkSpace, Record[1])) (DecPath, DecName) = os.path.split(DecFullPath) (InfPath, InfName) = os.path.split(InfFullPath) SqlCommand = """select Value1 from Dec where BelongsToFile = -- cgit v1.2.3