BaseTools: Remove EDK_SOURCE keyword from ECC Tool

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove EDK_SOURCE keyword from ECC Tool.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/Ecc/EccMain.py b/BaseTools/Source/Python/Ecc/EccMain.py
index 5f9e497e37ef30da55455887a07f234576274c0b..0f9744775179ef394c2738d5386bf2c3e4aae557 100644 (file)
--- a/BaseTools/Source/Python/Ecc/EccMain.py
+++ b/BaseTools/Source/Python/Ecc/EccMain.py
@@ -68,9 +68,6 @@ class Ecc(object):
         self.ParseOption()\r
         EdkLogger.info(time.strftime("%H:%M:%S, %b.%d %Y ", time.localtime()) + "[00:00]" + "\n")\r
 \r
-        #\r
-        # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP\r
-        #\r
         WorkspaceDir = os.path.normcase(os.path.normpath(os.environ["WORKSPACE"]))\r
         os.environ["WORKSPACE"] = WorkspaceDir\r
 \r
@@ -78,33 +75,9 @@ class Ecc(object):
         PackagesPath = os.getenv("PACKAGES_PATH")\r
         mws.setWs(WorkspaceDir, PackagesPath)\r
 \r
-        if "ECP_SOURCE" not in os.environ:\r
-            os.environ["ECP_SOURCE"] = mws.join(WorkspaceDir, GlobalData.gEdkCompatibilityPkg)\r
-        if "EFI_SOURCE" not in os.environ:\r
-            os.environ["EFI_SOURCE"] = os.environ["ECP_SOURCE"]\r
-        if "EDK_SOURCE" not in os.environ:\r
-            os.environ["EDK_SOURCE"] = os.environ["ECP_SOURCE"]\r
-\r
-        #\r
-        # Unify case of characters on case-insensitive systems\r
-        #\r
-        EfiSourceDir = os.path.normcase(os.path.normpath(os.environ["EFI_SOURCE"]))\r
-        EdkSourceDir = os.path.normcase(os.path.normpath(os.environ["EDK_SOURCE"]))\r
-        EcpSourceDir = os.path.normcase(os.path.normpath(os.environ["ECP_SOURCE"]))\r
-\r
-        os.environ["EFI_SOURCE"] = EfiSourceDir\r
-        os.environ["EDK_SOURCE"] = EdkSourceDir\r
-        os.environ["ECP_SOURCE"] = EcpSourceDir\r
-\r
         GlobalData.gWorkspace = WorkspaceDir\r
-        GlobalData.gEfiSource = EfiSourceDir\r
-        GlobalData.gEdkSource = EdkSourceDir\r
-        GlobalData.gEcpSource = EcpSourceDir\r
 \r
         GlobalData.gGlobalDefines["WORKSPACE"]  = WorkspaceDir\r
-        GlobalData.gGlobalDefines["EFI_SOURCE"] = EfiSourceDir\r
-        GlobalData.gGlobalDefines["EDK_SOURCE"] = EdkSourceDir\r
-        GlobalData.gGlobalDefines["ECP_SOURCE"] = EcpSourceDir\r
 \r
         EdkLogger.info("Loading ECC configuration ... done")\r
         # Generate checkpoints list\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 283789fd1ddd708341c25c68d1b7a08ce8bfd776..862974894a6d9c08f923f91c7e80c8e8ba449887 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -610,17 +610,6 @@ class InfParser(MetaFileParser):
                 if not Value:\r
                     continue\r
 \r
-                if Value.upper().find('$(EFI_SOURCE)\Edk'.upper()) > -1 or Value.upper().find('$(EFI_SOURCE)/Edk'.upper()) > -1:\r
-                    Value = '$(EDK_SOURCE)' + Value[17:]\r
-                if Value.find('$(EFI_SOURCE)') > -1 or Value.find('$(EDK_SOURCE)') > -1:\r
-                    pass\r
-                elif Value.startswith('.'):\r
-                    pass\r
-                elif Value.startswith('$('):\r
-                    pass\r
-                else:\r
-                    Value = '$(EFI_SOURCE)/' + Value\r
-\r
                 self._ValueList[Index] = ReplaceMacro(Value, Macros)\r
 \r
     ## Parse [Sources] section\r
@@ -1359,16 +1348,7 @@ class DscParser(MetaFileParser):
             # Allow using system environment variables  in path after !include\r
             #\r
             __IncludeMacros['WORKSPACE'] = GlobalData.gGlobalDefines['WORKSPACE']\r
-            if "ECP_SOURCE" in GlobalData.gGlobalDefines.keys():\r
-                __IncludeMacros['ECP_SOURCE'] = GlobalData.gGlobalDefines['ECP_SOURCE']\r
-            #\r
-            # During GenFds phase call DSC parser, will go into this branch.\r
-            #\r
-            elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys():\r
-                __IncludeMacros['ECP_SOURCE'] = GlobalData.gCommandLineDefines['ECP_SOURCE']\r
 \r
-            __IncludeMacros['EFI_SOURCE'] = GlobalData.gGlobalDefines['EFI_SOURCE']\r
-            __IncludeMacros['EDK_SOURCE'] = GlobalData.gGlobalDefines['EDK_SOURCE']\r
             #\r
             # Allow using MACROs comes from [Defines] section to keep compatible.\r
             #\r