BaseTools: Remove unused logic for EDKI

[mirror_edk2.git] / BaseTools / Source / Python / build / build.py

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 97271e634e6c19856b7a577ba263d7b4e88af769..bdeeca5035e34aea10f74eef0b076d1d288ceb51 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -37,8 +37,8 @@ from subprocess import *
 from Common import Misc as Utils\r
 \r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
-from Common.TargetTxtClassObject import *\r
-from Common.ToolDefClassObject import *\r
+from Common.TargetTxtClassObject import TargetTxtClassObject\r
+from Common.ToolDefClassObject import ToolDefClassObject\r
 from Common.DataType import *\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from AutoGen.AutoGen import *\r
@@ -122,65 +122,9 @@ def CheckEnvVariable():
             elif ' ' in Path:\r
                 EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in PACKAGES_PATH", ExtraData=Path)\r
 \r
-    #\r
-    # Check EFI_SOURCE (Edk build convention). EDK_SOURCE will always point to ECP\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
     os.environ["EDK_TOOLS_PATH"] = os.path.normcase(os.environ["EDK_TOOLS_PATH"])\r
 \r
-    if not os.path.exists(EcpSourceDir):\r
-        EdkLogger.verbose("ECP_SOURCE = %s doesn't exist. Edk modules could not be built." % EcpSourceDir)\r
-    elif ' ' in EcpSourceDir:\r
-        EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in ECP_SOURCE path",\r
-                        ExtraData=EcpSourceDir)\r
-    if not os.path.exists(EdkSourceDir):\r
-        if EdkSourceDir == EcpSourceDir:\r
-            EdkLogger.verbose("EDK_SOURCE = %s doesn't exist. Edk modules could not be built." % EdkSourceDir)\r
-        else:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE does not exist",\r
-                            ExtraData=EdkSourceDir)\r
-    elif ' ' in EdkSourceDir:\r
-        EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in EDK_SOURCE path",\r
-                        ExtraData=EdkSourceDir)\r
-    if not os.path.exists(EfiSourceDir):\r
-        if EfiSourceDir == EcpSourceDir:\r
-            EdkLogger.verbose("EFI_SOURCE = %s doesn't exist. Edk modules could not be built." % EfiSourceDir)\r
-        else:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE does not exist",\r
-                            ExtraData=EfiSourceDir)\r
-    elif ' ' in EfiSourceDir:\r
-        EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in EFI_SOURCE path",\r
-                        ExtraData=EfiSourceDir)\r
-\r
-    # check those variables on single workspace case\r
-    if not PackagesPath:\r
-        # change absolute path to relative path to WORKSPACE\r
-        if EfiSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE is not under WORKSPACE",\r
-                            ExtraData="WORKSPACE = %s\n    EFI_SOURCE = %s" % (WorkspaceDir, EfiSourceDir))\r
-        if EdkSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE is not under WORKSPACE",\r
-                            ExtraData="WORKSPACE = %s\n    EDK_SOURCE = %s" % (WorkspaceDir, EdkSourceDir))\r
-        if EcpSourceDir.upper().find(WorkspaceDir.upper()) != 0:\r
-            EdkLogger.error("build", PARAMETER_INVALID, "ECP_SOURCE is not under WORKSPACE",\r
-                            ExtraData="WORKSPACE = %s\n    ECP_SOURCE = %s" % (WorkspaceDir, EcpSourceDir))\r
-\r
     # check EDK_TOOLS_PATH\r
     if "EDK_TOOLS_PATH" not in os.environ:\r
         EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "Environment variable not found",\r
@@ -192,14 +136,8 @@ def CheckEnvVariable():
                         ExtraData="PATH")\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
     GlobalData.gGlobalDefines["EDK_TOOLS_PATH"] = os.environ["EDK_TOOLS_PATH"]\r
 \r
 ## Get normalized file path\r
@@ -848,9 +786,6 @@ class Build():
         if "PACKAGES_PATH" in os.environ:\r
             # WORKSPACE env has been converted before. Print the same path style with WORKSPACE env.\r
             EdkLogger.quiet("%-16s = %s" % ("PACKAGES_PATH", os.path.normcase(os.path.normpath(os.environ["PACKAGES_PATH"]))))\r
-        EdkLogger.quiet("%-16s = %s" % ("ECP_SOURCE", os.environ["ECP_SOURCE"]))\r
-        EdkLogger.quiet("%-16s = %s" % ("EDK_SOURCE", os.environ["EDK_SOURCE"]))\r
-        EdkLogger.quiet("%-16s = %s" % ("EFI_SOURCE", os.environ["EFI_SOURCE"]))\r
         EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))\r
         if "EDK_TOOLS_BIN" in os.environ:\r
             # Print the same path style with WORKSPACE env.\r
@@ -884,7 +819,7 @@ class Build():
         if os.path.isfile(BuildConfigurationFile) == True:\r
             StatusCode = self.TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
 \r
-            ToolDefinitionFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
+            ToolDefinitionFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
             if ToolDefinitionFile == '':\r
                 ToolDefinitionFile = gToolsDefinition\r
                 ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
@@ -897,16 +832,16 @@ class Build():
 \r
         # if no ARCH given in command line, get it from target.txt\r
         if not self.ArchList:\r
-            self.ArchList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET_ARCH]\r
+            self.ArchList = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TARGET_ARCH]\r
         self.ArchList = tuple(self.ArchList)\r
 \r
         # if no build target given in command line, get it from target.txt\r
         if not self.BuildTargetList:\r
-            self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
+            self.BuildTargetList = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TARGET]\r
 \r
         # if no tool chain given in command line, get it from target.txt\r
         if not self.ToolChainList:\r
-            self.ToolChainList = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\r
+            self.ToolChainList = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\r
             if self.ToolChainList is None or len(self.ToolChainList) == 0:\r
                 EdkLogger.error("build", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.\n")\r
 \r
@@ -936,7 +871,7 @@ class Build():
         self.ToolChainFamily = ToolChainFamily\r
 \r
         if self.ThreadNumber is None:\r
-            self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
+            self.ThreadNumber = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
             if self.ThreadNumber == '':\r
                 self.ThreadNumber = 0\r
             else:\r
@@ -949,7 +884,7 @@ class Build():
                 self.ThreadNumber = 1\r
 \r
         if not self.PlatformFile:\r
-            PlatformFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_ACTIVE_PLATFORM]\r
+            PlatformFile = self.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_ACTIVE_PLATFORM]\r
             if not PlatformFile:\r
                 # Try to find one in current directory\r
                 WorkingDirectory = os.getcwd()\r