BaseTools: Update Build tool to support multiple workspaces

WORKSPACE is still kept.
New PACKAGES_PATH is introduced to specify the additional WORKSPACEs.
In PACKAGES_PATH, ';' is separator in Windows, ':' is separator in Linux.

Build directory is in WORKSPACE. Package, BaseTools and Conf directory
will be found from WORKSPACE and PACKAGES_PATH.

In implementation, BaseTools adds MultipleWorkspace class for
the file path conversion from WORKSPACE and PACKAGES_PATH.

Verify two tree layouts.
Root\edk2\MdePkg
Root\edk2\MdeMdeModulePkg
Root\edk2\...
1. set WORKSPACE=Root\edk2
2. set WORKSPACE=Root, and set PACKAGES_PATH=Root\edk2

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Li YangX <yangx.li@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18579 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 9 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index c2ad4e0e2a..a0beff0391 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -39,6 +39,7 @@ from Common.Misc import SaveFileOnChange
 from Common.Misc import ClearDuplicatedInf

 from Common.Misc import GuidStructureStringToGuidString

 from Common.BuildVersion import gBUILD_VERSION

+from Common.MultipleWorkspace import MultipleWorkspace as mws

 

 ## Version and Copyright

 versionNumber = "1.0" + ' ' + gBUILD_VERSION

@@ -94,6 +95,10 @@ def main():
             if (Options.debug):

                 GenFdsGlobalVariable.VerboseLogger( "Using Workspace:" + Workspace)

         os.chdir(GenFdsGlobalVariable.WorkSpaceDir)

+        

+        # set multiple workspace

+        PackagesPath = os.getenv("PACKAGES_PATH")

+        mws.setWs(GenFdsGlobalVariable.WorkSpaceDir, PackagesPath)

 

         if (Options.filename):

             FdfFilename = Options.filename

@@ -102,7 +107,7 @@ def main():
             if FdfFilename[0:2] == '..':

                 FdfFilename = os.path.realpath(FdfFilename)

             if not os.path.isabs (FdfFilename):

-                FdfFilename = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, FdfFilename)

+                FdfFilename = mws.join(GenFdsGlobalVariable.WorkSpaceDir, FdfFilename)

             if not os.path.exists(FdfFilename):

                 EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=FdfFilename)

 

@@ -129,13 +134,13 @@ def main():
                 ActivePlatform = os.path.realpath(ActivePlatform)

 

             if not os.path.isabs (ActivePlatform):

-                ActivePlatform = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, 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 = ActivePlatform[len(Workspace):]

+                ActivePlatform = mws.relpath(ActivePlatform, Workspace)

             if len(ActivePlatform) > 0 :

                 if ActivePlatform[0] == '\\' or ActivePlatform[0] == '/':

                     ActivePlatform = ActivePlatform[1:]

@@ -159,7 +164,7 @@ def main():
                 ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, ConfDirectoryPath)

         else:

             # Get standard WORKSPACE/Conf, use the absolute path to the WORKSPACE/Conf

-            ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, 'Conf')

+            ConfDirectoryPath = mws.join(GenFdsGlobalVariable.WorkSpaceDir, 'Conf')

         GenFdsGlobalVariable.ConfDir = ConfDirectoryPath

         BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))

         if os.path.isfile(BuildConfigurationFile) == True: