BaseTools:Fix GenFds issue for BuildOption replace GenFdsOption

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2455

BuildOption is used by TargetTxtClassObj.py
GenFdsOption is used by GenFds.py
When the GenFds tool is used alone (e.g. python3 -m GenFds.GenFds -h)
With the OptionParser function, the first detected function
prints the help message

import TargetTxtClassObj to GenFds,
The BuildOption will be executed and replace GenFdsOption

We removed all objects associated with this problem that
were created directly during the import process
(e.g. BuildOption, BuildTarget = MyOptionParser(),
 TargetTxt = TargetTxtDict())

The Patch is going to fix this issue

Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index d8bc28e4d0..d5511f4c40 100644
--- 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

 

 import Common.LongFilePathOs as os

-from Common.TargetTxtClassObject import TargetTxt

+from Common.TargetTxtClassObject import TargetTxtDict

 from Common.DataType import *

 import Common.GlobalData as GlobalData

 from Common import EdkLogger

@@ -210,6 +210,8 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
         BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))

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

             # if no build target given in command line, get it from target.txt

+            TargetObj = TargetTxtDict()

+            TargetTxt = TargetObj.Target

             if not GenFdsGlobalVariable.TargetName:

                 BuildTargetList = TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_TARGET]

                 if len(BuildTargetList) != 1:

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 6e1ff7fe04..dc1727c466 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -23,9 +23,9 @@ from Common.BuildToolError import COMMAND_FAILURE,GENFDS_ERROR
 from Common import EdkLogger

 from Common.Misc import SaveFileOnChange

 

-from Common.TargetTxtClassObject import TargetTxt

-from Common.ToolDefClassObject import ToolDef

-from AutoGen.BuildEngine import BuildRuleObj

+from Common.TargetTxtClassObject import TargetTxtDict

+from Common.ToolDefClassObject import ToolDefDict

+from AutoGen.BuildEngine import ToolBuildRule

 import Common.DataType as DataType

 from Common.Misc import PathClass

 from Common.LongFilePathSupport import OpenLongFilePath as open

@@ -96,12 +96,15 @@ class GenFdsGlobalVariable:
     def _LoadBuildRule():

         if GenFdsGlobalVariable.__BuildRuleDatabase:

             return GenFdsGlobalVariable.__BuildRuleDatabase

-        GenFdsGlobalVariable.__BuildRuleDatabase = BuildRuleObj

-        ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]

+        BuildRule = ToolBuildRule()

+        GenFdsGlobalVariable.__BuildRuleDatabase = BuildRule.ToolBuildRule

+        TargetObj = TargetTxtDict()

+        ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]

         if ToolDefinitionFile == '':

             ToolDefinitionFile = "Conf/tools_def.txt"

         if os.path.isfile(ToolDefinitionFile):

-            ToolDefinition = ToolDef.ToolsDefTxtDatabase

+            ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))

+            ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase

             if DataType.TAB_TOD_DEFINES_BUILDRULEFAMILY in ToolDefinition \

                and GenFdsGlobalVariable.ToolChainTag in ToolDefinition[DataType.TAB_TOD_DEFINES_BUILDRULEFAMILY] \

                and ToolDefinition[DataType.TAB_TOD_DEFINES_BUILDRULEFAMILY][GenFdsGlobalVariable.ToolChainTag]:

@@ -830,6 +833,8 @@ class GenFdsGlobalVariable:
 #  @param  NameGuid         The Guid name

 #

 def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):

+    ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))

+    ToolDef = ToolDefObj.ToolDef

     ToolDb = ToolDef.ToolsDefTxtDatabase

     # if user not specify filter, try to deduce it from global data.

     if KeyStringList is None or KeyStringList == []: