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

BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py

@@ -32,6 +32,7 @@ from Logger.ToolError import EDK1_INF_ERROR
 from Object.POM.CommonObject import IdentificationObject
 from Object.POM.CommonObject import CommonHeaderObject
 from Object.POM.CommonObject import MiscFileObject
+from Common.MultipleWorkspace import MultipleWorkspace as mws
 
 ## DistributionPackageHeaderClass
 #
@@ -110,14 +111,17 @@ class DistributionPackageClass(object):
     # @param ModuleList:    A list of all modules
     #
     def GetDistributionPackage(self, WorkspaceDir, PackageList, ModuleList):
+        # Backup WorkspaceDir
+        Root = WorkspaceDir
+
         #
         # Get Packages
         #
         if PackageList:
             for PackageFile in PackageList:
-                PackageFileFullPath = \
+                PackageFileFullPath = mws.join(Root, PackageFile)
-                os.path.normpath(os.path.join(WorkspaceDir, PackageFile))
+                WorkspaceDir = mws.getWs(Root, PackageFile)
-                DecObj = DecPomAlignment(PackageFileFullPath, WorkspaceDir, CheckMulDec = True)
+                DecObj = DecPomAlignment(PackageFileFullPath, WorkspaceDir, CheckMulDec=True)
                 PackageObj = DecObj
                 #
                 # Parser inf file one bye one
@@ -140,8 +144,7 @@ class DistributionPackageClass(object):
                     # Inf class in InfPomAlignment.
                     #
                     try:
-                        ModuleObj = InfPomAlignment(Filename, WorkspaceDir, \
+                        ModuleObj = InfPomAlignment(Filename, WorkspaceDir, PackageObj.GetPackagePath())
-                                                PackageObj.GetPackagePath())
      
                         #
                         # Add module to package
@@ -168,11 +171,11 @@ class DistributionPackageClass(object):
         #
         if ModuleList:
             for ModuleFile in ModuleList:
-                ModuleFileFullPath = \
+                ModuleFileFullPath = mws.join(Root, ModuleFile)
-                os.path.normpath(os.path.join(WorkspaceDir, ModuleFile))
+                WorkspaceDir = mws.getWs(Root, ModuleFile)
+
                 try:
-                    ModuleObj = InfPomAlignment(ModuleFileFullPath, 
+                    ModuleObj = InfPomAlignment(ModuleFileFullPath, WorkspaceDir)
-                                                WorkspaceDir)
                     ModuleKey = (ModuleObj.GetGuid(), 
                                  ModuleObj.GetVersion(), 
                                  ModuleObj.GetName(), 
@@ -187,6 +190,9 @@ class DistributionPackageClass(object):
                     else:
                         raise
 
+        # Recover WorkspaceDir
+        WorkspaceDir = Root
+
     ## Get all files included for a distribution package, except tool/misc of 
     # distribution level
     # 

BaseTools/Source/Python/UPT/Core/PackageFile.py

@@ -37,6 +37,7 @@ from Logger import StringTable as ST
 from Library.Misc import CreateDirectory
 from Library.Misc import RemoveDirectory
 from Core.FileHook import __FileHookOpen__
+from Common.MultipleWorkspace import MultipleWorkspace as mws
 
 
 class PackageFile:
@@ -203,8 +204,11 @@ class PackageFile:
     # @param Files:  the files to pack 
     #
     def PackFiles(self, Files):
-        for File1 in Files:
+        for File in Files:
-            self.PackFile(File1)
+            Cwd = os.getcwd()
+            os.chdir(mws.getWs(mws.WORKSPACE, File))
+            self.PackFile(File)
+            os.chdir(Cwd)
 
     ## Pack the file
     # 

BaseTools/Source/Python/UPT/Library/GlobalData.py

@@ -19,6 +19,7 @@ GlobalData
 # The workspace directory 
 #
 gWORKSPACE = '.'
+gPACKAGE_PATH = None
 
 #
 # INF module directory

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
 #

BaseTools/Source/Python/UPT/Library/ParserValidate.py

@@ -27,6 +27,7 @@ from Library.DataType import TAB_SPACE_SPLIT
 from Library.String import GetSplitValueList
 from Library.ExpressionValidate import IsValidBareCString
 from Library.ExpressionValidate import IsValidFeatureFlagExp
+from CommonDataClass.CommonClass import MultipleWorkspace as mws
 
 ## __HexDigit() method
 #
@@ -236,7 +237,7 @@ def IsValidPath(Path, Root):
     
     Path = os.path.normpath(Path).replace('\\', '/')
     Root = os.path.normpath(Root).replace('\\', '/')
-    FullPath = os.path.normpath(os.path.join(Root, Path)).replace('\\', '/')
+    FullPath = mws.join(Root, Path)
     
     if not os.path.exists(FullPath):
         return False

BaseTools/Source/Python/UPT/Library/Parsing.py

@@ -827,7 +827,9 @@ def GetPkgInfoFromDec(Path):
 def GetWorkspacePackage():
     DecFileList = []
     WorkspaceDir = GlobalData.gWORKSPACE
-    for Root, Dirs, Files in os.walk(WorkspaceDir):
+    PackageDir = GlobalData.gPACKAGE_PATH
+    for PkgRoot in [WorkspaceDir] + PackageDir:
+        for Root, Dirs, Files in os.walk(PkgRoot):
             if 'CVS' in Dirs:
                 Dirs.remove('CVS')
             if '.svn' in Dirs:

BaseTools/Source/Python/UPT/MkPkg.py

@@ -50,6 +50,7 @@ from Library.ParserValidate import IsValidPath
 
 from Core.DistributionPackageClass import DistributionPackageClass
 from Core.PackageFile import PackageFile
+from Common.MultipleWorkspace import MultipleWorkspace as mws
 
 ## CheckForExistingDp
 #
@@ -136,7 +137,7 @@ def Main(Options = None):
                 # write().
                 #
                 FromFile = os.path.normpath(FileObject.GetURI()).encode('utf_8')
-                FileFullPath = os.path.normpath(os.path.join(WorkspaceDir, FromFile))
+                FileFullPath = mws.join(WorkspaceDir, FromFile)
                 if FileFullPath in RePkgDict:
                     (DpGuid, DpVersion, DpName, Repackage) = RePkgDict[FileFullPath]
                     if not Repackage:
@@ -264,7 +265,7 @@ def CheckFileList(QualifiedExt, FileList, ErrorStringExt, ErrorStringFullPath):
                          ErrorStringExt % Item)
         
         Item = os.path.normpath(Item)
-        Path = os.path.normpath(os.path.join(WorkspaceDir, Item))
+        Path = mws.join(WorkspaceDir, Item)
         if not os.path.exists(Path):
             Logger.Error("\nMkPkg", FILE_NOT_FOUND, ST.ERR_NOT_FOUND % Item)
         elif Item == Path:

BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py

@@ -51,7 +51,7 @@ from PomAdapter.InfPomAlignmentMisc import GenModuleHeaderUserExt
 from PomAdapter.InfPomAlignmentMisc import GenBinaryData
 from Parser import InfParser
 from PomAdapter.DecPomAlignment import DecPomAlignment
-
+from Common.MultipleWorkspace import MultipleWorkspace as mws
 
 ## InfPomAlignment
 #
@@ -534,8 +534,7 @@ class InfPomAlignment(ModuleObject):
             PackageDependency.SetSupArchList(ConvertArchList(PackageItemObj.GetSupArchList()))
             PackageDependency.SetFeatureFlag(PackageItemObj.GetFeatureFlagExp())
 
-            PkgInfo = GetPkgInfoFromDec(os.path.normpath(os.path.join(self.WorkSpace,
+            PkgInfo = GetPkgInfoFromDec(mws.join(self.WorkSpace, NormPath(PackageItemObj.GetPackageName())))
-                                                                      NormPath(PackageItemObj.GetPackageName()))))
             if PkgInfo[1] and PkgInfo[2]:
                 PackageDependency.SetGuid(PkgInfo[1])
                 PackageDependency.SetVersion(PkgInfo[2])

BaseTools/Source/Python/UPT/UPT.py

@@ -39,6 +39,7 @@ from Logger.ToolError import FILE_TYPE_MISMATCH
 from Logger.ToolError import OPTION_CONFLICT
 from Logger.ToolError import FatalError
 from Logger.ToolError import UPT_ALREADY_INSTALLED_ERROR
+from Common.MultipleWorkspace import MultipleWorkspace as mws
 
 import MkPkg
 import InstallPkg
@@ -164,7 +165,7 @@ def Main():
         setattr(Opt, Var[0], Var[1])
 
     try:
-        GlobalData.gWORKSPACE = GetWorkspace()
+        GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH = GetWorkspace()
     except FatalError, XExcept:
         if Logger.GetLevel() <= Logger.DEBUG_9:
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())