BaseTools: Update ECC tool to support multiple workspaces

Update ECC to refer MultipleWorkspace class to convert
the file path from WORKSPACE and PACKAGES_PATH.

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@18581 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 7 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index ec8f6c22cf..c2ad4faff4 100644
--- a/BaseTools/Source/Python/Ecc/Ecc.py
+++ b/BaseTools/Source/Python/Ecc/Ecc.py
@@ -38,6 +38,7 @@ import c
 import re, string

 from Exception import *

 from Common.LongFilePathSupport import OpenLongFilePath as open

+from Common.MultipleWorkspace import MultipleWorkspace as mws

 

 ## Ecc

 #

@@ -70,8 +71,13 @@ class Ecc(object):
         #

         WorkspaceDir = os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))

         os.environ["WORKSPACE"] = WorkspaceDir

+        

+        # set multiple workspace

+        PackagesPath = os.getenv("PACKAGES_PATH")

+        mws.setWs(WorkspaceDir, PackagesPath)

+        

         if "ECP_SOURCE" not in os.environ:

-            os.environ["ECP_SOURCE"] = os.path.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)

+            os.environ["ECP_SOURCE"] = mws.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)

         if "EFI_SOURCE" not in os.environ:

             os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]

         if "EDK_SOURCE" not in os.environ: