BaseTools: Remove hard-coded strings for target and tools_def

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3653

The "target.txt" and "tools_def.txt" filenames are hard-coded
at some places when global definitions are available at:
BaseTools/Source/Python/Common/TargetTxtClassObject.py:
DefaultTargetTxtFile
and
BaseTools/Source/Python/Common/ToolDefClassObject.py:
DefaultToolsDefFile

Use these global definitions instead.

Also remove the unused gBuildConfiguration and gToolsDefinition
variables from build.py

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index ae3e776a5540607d4423164f7d617893d7e10f1f..c34104500059f89eb5fe2657d26ff9a05f7ee001 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -20,7 +20,7 @@ from linecache import getlines
 from io import BytesIO\r
 \r
 import Common.LongFilePathOs as os\r
-from Common.TargetTxtClassObject import TargetTxtDict\r
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile\r
 from Common.DataType import *\r
 import Common.GlobalData as GlobalData\r
 from Common import EdkLogger\r
@@ -207,7 +207,7 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
         GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r
         if not GlobalData.gConfDirectory:\r
             GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir\r
-        BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))\r
+        BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, gDefaultTargetTxtFile))\r
         if os.path.isfile(BuildConfigurationFile) == True:\r
             # if no build target given in command line, get it from target.txt\r
             TargetObj = TargetTxtDict()\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 25f9d54874d38bf5b222d7f133beed027d471c18..d7668ba681aac7452deec406a981d11def9704ea 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -24,7 +24,7 @@ from Common import EdkLogger
 from Common.Misc import SaveFileOnChange\r
 \r
 from Common.TargetTxtClassObject import TargetTxtDict\r
-from Common.ToolDefClassObject import ToolDefDict\r
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile\r
 from AutoGen.BuildEngine import ToolBuildRule\r
 import Common.DataType as DataType\r
 from Common.Misc import PathClass,CreateDirectory\r
@@ -103,7 +103,7 @@ class GenFdsGlobalVariable:
         TargetObj = TargetTxtDict()\r
         ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
         if ToolDefinitionFile == '':\r
-            ToolDefinitionFile = "Conf/tools_def.txt"\r
+            ToolDefinitionFile =  os.path.join('Conf', gDefaultToolsDefFile)\r
         if os.path.isfile(ToolDefinitionFile):\r
             ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
             ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r

diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index 71222e3cc89997fcff82608ee536e08d8b78a7ac..7f2479f0f0acbf92563d096f55beb9fd9bdc7c22 100644 (file)
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -17,6 +17,7 @@ import Common.BuildToolError as BuildToolError
 from Common.DataType import *\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.TargetTxtClassObject import gDefaultTargetTxtFile\r
 \r
 # To Do 1.set clean, 2. add item, if the line is disabled.\r
 \r
@@ -25,7 +26,7 @@ class TargetTool():
         self.WorkSpace = os.path.normpath(os.getenv('WORKSPACE'))\r
         self.Opt       = opt\r
         self.Arg       = args[0]\r
-        self.FileName  = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', 'target.txt'))\r
+        self.FileName  = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', gDefaultTargetTxtFile))\r
         if os.path.isfile(self.FileName) == False:\r
             print("%s does not exist." % self.FileName)\r
             sys.exit(1)\r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 4d5b1ad4d90a1f241d1dc7e255c01e79363a9008..d1ee0ccaea7e3b7bf767e1780691902a24d7ff40 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -19,8 +19,8 @@ from Common.Misc import *
 from types import *\r
 from Common.Expression import *\r
 from CommonDataClass.CommonClass import SkuInfoClass\r
-from Common.TargetTxtClassObject import TargetTxtDict\r
-from Common.ToolDefClassObject import ToolDefDict\r
+from Common.TargetTxtClassObject import TargetTxtDict,gDefaultTargetTxtFile\r
+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile\r
 from .MetaDataTable import *\r
 from .MetaFileTable import *\r
 from .MetaFileParser import *\r
@@ -3526,12 +3526,11 @@ class DscBuildData(PlatformBuildClassObject):
         self._ToolChainFamily = TAB_COMPILER_MSFT\r
         TargetObj = TargetTxtDict()\r
         TargetTxt = TargetObj.Target\r
-        BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, "target.txt"))\r
+        BuildConfigurationFile = os.path.normpath(os.path.join(GlobalData.gConfDirectory, gDefaultTargetTxtFile))\r
         if os.path.isfile(BuildConfigurationFile) == True:\r
             ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
             if ToolDefinitionFile == '':\r
-                ToolDefinitionFile = "tools_def.txt"\r
-                ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', ToolDefinitionFile))\r
+                ToolDefinitionFile = os.path.normpath(mws.join(self.WorkspaceDir, 'Conf', gDefaultToolsDefFile))\r
             if os.path.isfile(ToolDefinitionFile) == True:\r
                 ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))\r
                 ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index e4969d863f6e511e7a60f198ff7ff18d37c2068f..07187c03618a28c734b8d46abd22cc3f6a35d4a4 100755 (executable)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -67,10 +67,6 @@ from AutoGen.AutoGen import CalculatePriorityValue
 ## standard targets of build command\r
 gSupportedTarget = ['all', 'genc', 'genmake', 'modules', 'libraries', 'fds', 'clean', 'cleanall', 'cleanlib', 'run']\r
 \r
-## build configuration file\r
-gBuildConfiguration = "target.txt"\r
-gToolsDefinition = "tools_def.txt"\r
-\r
 TemporaryTablePattern = re.compile(r'^_\d+_\d+_[a-fA-F0-9]+$')\r
 TmpTableDict = {}\r
 \r