diff options
author | Hesheng Chen <hesheng.chen@intel.com> | 2015-10-08 09:28:15 +0000 |
---|---|---|
committer | lgao4 <lgao4@Edk2> | 2015-10-08 09:28:15 +0000 |
commit | fb0f8067ea4bfe21b8bc3bd2b2617f5b3d8d87aa (patch) | |
tree | 882a5514c217ca069268fd4cbbece6ad738fcb85 /BaseTools/Source/Python/UPT/Library/Misc.py | |
parent | 05cc51ad5894c8904d0fe5cdcf3f4d0a07dab85d (diff) | |
download | edk2-fb0f8067ea4bfe21b8bc3bd2b2617f5b3d8d87aa.tar.gz edk2-fb0f8067ea4bfe21b8bc3bd2b2617f5b3d8d87aa.tar.bz2 edk2-fb0f8067ea4bfe21b8bc3bd2b2617f5b3d8d87aa.zip |
BaseTools: Update UPT tool to support multiple workspaces
Update UPT to refer MultipleWorkspace class to convert
the file path from WORKSPACE and PACKAGES_PATH.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hesheng Chen <hesheng.chen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18580 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source/Python/UPT/Library/Misc.py')
-rw-r--r-- | BaseTools/Source/Python/UPT/Library/Misc.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source/Python/UPT/Library/Misc.py index bc9e0e172b..df9db2439b 100644 --- a/BaseTools/Source/Python/UPT/Library/Misc.py +++ b/BaseTools/Source/Python/UPT/Library/Misc.py @@ -50,6 +50,7 @@ from Library.ParserValidate import IsValidHexVersion from Library.ParserValidate import IsValidPath
from Object.POM.CommonObject import TextObject
from Core.FileHook import __FileHookOpen__
+from CommonDataClass.CommonClass import MultipleWorkspace as mws
## Convert GUID string in xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx style to C
# structure style
@@ -592,7 +593,11 @@ def GetWorkspace(): if WorkspaceDir[-1] == ':':
WorkspaceDir += os.sep
- return WorkspaceDir
+
+ PackagesPath = os.environ.get("PACKAGES_PATH")
+ mws.setWs(WorkspaceDir, PackagesPath)
+
+ return WorkspaceDir, mws.PACKAGES_PATH
## Get relative path
#
|