Reviewed-by: Liming Gao <liming....@intel.com> > -----Original Message----- > From: Zhu, Yonghong > Sent: Monday, April 18, 2016 3:40 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming; Marvin Haeuser > Subject: [Patch] BaseTools/GenFds: remove the old logic since > ActivePlatform is abs. path > > We can support the DSC file out of workspace. this old logic first make > the absolute path to relative path and strips the leading slash off, > then append it to workspace. it cause GenFds failure on Linux when the > DSC file is out of workspace. Since we make sure the ActivePlatform is > abs. path, so we don't need this old logic to change the abs. path to > relative. > > Cc: Liming Gao <liming....@intel.com> > Cc: Marvin Haeuser <marvin.haeu...@outlook.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu <yonghong....@intel.com> > --- > BaseTools/Source/Python/GenFds/GenFds.py | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/BaseTools/Source/Python/GenFds/GenFds.py > b/BaseTools/Source/Python/GenFds/GenFds.py > index d97fc28..c2a2bd3 100644 > --- a/BaseTools/Source/Python/GenFds/GenFds.py > +++ b/BaseTools/Source/Python/GenFds/GenFds.py > @@ -136,22 +136,14 @@ def main(): > if not os.path.isabs (ActivePlatform): > ActivePlatform = mws.join(GenFdsGlobalVariable.WorkSpaceDir, > ActivePlatform) > > if not os.path.exists(ActivePlatform) : > EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform > doesn't exist!") > - > - if os.path.normcase (ActivePlatform).find(Workspace) == 0: > - ActivePlatform = mws.relpath(ActivePlatform, Workspace) > - if len(ActivePlatform) > 0 : > - if ActivePlatform[0] == '\\' or ActivePlatform[0] == '/': > - ActivePlatform = ActivePlatform[1:] > - else: > - EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform > doesn't exist!") > else: > EdkLogger.error("GenFds", OPTION_MISSING, "Missing active > platform") > > - GenFdsGlobalVariable.ActivePlatform = > PathClass(NormPath(ActivePlatform), Workspace) > + GenFdsGlobalVariable.ActivePlatform = > PathClass(NormPath(ActivePlatform)) > > if (Options.ConfDirectory): > # Get alternate Conf location, if it is absolute, then just use > the > absolute directory name > ConfDirectoryPath = os.path.normpath(Options.ConfDirectory) > if ConfDirectoryPath.startswith('"'): > -- > 2.6.1.windows.1
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel