sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fix a bug Build directory should relative to WORKSPACE

Browse Source 
The bug is for build output files it still use mws.join function, it
cause maybe we will get the build output files in the PACKAGES_PATH
because mws.join will try WORKSPACE first, if the file doesn't exist
then try PACKAGES_PATH. But for build output, we expected it should
relative to WORKSPACE.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu
2017-10-13 10:47:24 +08:00
parent 9c8c4478cf
commit 9705814429
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -1798,6 +1798,7 @@ class PlatformAutoGen(AutoGen):
self.OutputDir, self.OutputDir,
self.BuildTarget + "_" + self.ToolChain, self.BuildTarget + "_" + self.ToolChain,
) )
GlobalData.gBuildDirectory = self._BuildDir
return self._BuildDir return self._BuildDir
## Return directory of platform makefile ## Return directory of platform makefile

1
BaseTools/Source/Python/Common/GlobalData.py
View File

@ -56,6 +56,7 @@ gAutoGenPhase = False
# #
gConfDirectory = '' gConfDirectory = ''
gBuildDirectory = ''
# #
# The relative default database file path # The relative default database file path
# #

2
BaseTools/Source/Python/Common/String.py
View File

@ -311,7 +311,7 @@ def NormPath(Path, Defines={}):
# To local path format # To local path format
# #
Path = os.path.normpath(Path) Path = os.path.normpath(Path)
if Path.startswith(GlobalData.gWorkspace) and not os.path.exists(Path): if Path.startswith(GlobalData.gWorkspace) and not Path.startswith(GlobalData.gBuildDirectory) and not os.path.exists(Path):
Path = Path[len (GlobalData.gWorkspace):] Path = Path[len (GlobalData.gWorkspace):]
if Path[0] == os.path.sep: if Path[0] == os.path.sep:
Path = Path[1:] Path = Path[1:]