BaseTools: create and use a standard shared variable for '*'

[mirror_edk2.git] / BaseTools / Source / Python / Common / ToolDefClassObject.py

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 05a1ddfbcc89dcd056938bec7779f6af636a2c1f..186d279840c1ce5b57b2826378ab7a1fb9b07788 100644 (file)
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -29,7 +29,8 @@ from Common import GlobalData
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from .DataType import TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_TAG,\\r
                      TAB_TOD_DEFINES_TARGET_ARCH, TAB_TOD_DEFINES_COMMAND_TYPE\\r
-                     , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFAMILY\r
+                     , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFAMILY,\\r
+                     TAB_STAR, TAB_TAT_DEFINES_TOOL_CHAIN_CONF\r
 \r
 \r
 ##\r
@@ -97,7 +98,7 @@ class ToolDefClassObject(object):
             # adding/removing items from the original dict.\r
             for Key in list(self.ToolsDefTxtDictionary.keys()):\r
                 List = Key.split('_')\r
-                if List[Index] == '*':\r
+                if List[Index] == TAB_STAR:\r
                     for String in self.ToolsDefTxtDatabase[KeyList[Index]]:\r
                         List[Index] = String\r
                         NewKey = '%s_%s_%s_%s_%s' % tuple(List)\r
@@ -202,20 +203,20 @@ class ToolDefClassObject(object):
             if len(List) != 5:\r
                 EdkLogger.verbose("Line %d: Not a valid name of definition: %s" % ((Index + 1), Name))\r
                 continue\r
-            elif List[4] == '*':\r
+            elif List[4] == TAB_STAR:\r
                 EdkLogger.verbose("Line %d: '*' is not allowed in last field: %s" % ((Index + 1), Name))\r
                 continue\r
             else:\r
                 self.ToolsDefTxtDictionary[Name] = Value\r
-                if List[0] != '*':\r
+                if List[0] != TAB_STAR:\r
                     self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TARGET] += [List[0]]\r
-                if List[1] != '*':\r
+                if List[1] != TAB_STAR:\r
                     self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TOOL_CHAIN_TAG] += [List[1]]\r
-                if List[2] != '*':\r
+                if List[2] != TAB_STAR:\r
                     self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_TARGET_ARCH] += [List[2]]\r
-                if List[3] != '*':\r
+                if List[3] != TAB_STAR:\r
                     self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_COMMAND_TYPE] += [List[3]]\r
-                if List[4] == TAB_TOD_DEFINES_FAMILY and List[2] == '*' and List[3] == '*':\r
+                if List[4] == TAB_TOD_DEFINES_FAMILY and List[2] == TAB_STAR and List[3] == TAB_STAR:\r
                     if TAB_TOD_DEFINES_FAMILY not in self.ToolsDefTxtDatabase:\r
                         self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY] = {}\r
                         self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY][List[1]] = Value\r
@@ -226,7 +227,7 @@ class ToolDefClassObject(object):
                         self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_BUILDRULEFAMILY][List[1]] = Value\r
                     elif self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY][List[1]] != Value:\r
                         EdkLogger.verbose("Line %d: No override allowed for the family of a tool chain: %s" % ((Index + 1), Name))\r
-                if List[4] == TAB_TOD_DEFINES_BUILDRULEFAMILY and List[2] == '*' and List[3] == '*':\r
+                if List[4] == TAB_TOD_DEFINES_BUILDRULEFAMILY and List[2] == TAB_STAR and List[3] == TAB_STAR:\r
                     if TAB_TOD_DEFINES_BUILDRULEFAMILY not in self.ToolsDefTxtDatabase \\r
                        or List[1] not in self.ToolsDefTxtDatabase[TAB_TOD_DEFINES_FAMILY]:\r
                         EdkLogger.verbose("Line %d: The family is not specified, but BuildRuleFamily is specified for the tool chain: %s" % ((Index + 1), Name))\r
@@ -270,8 +271,8 @@ class ToolDefClassObject(object):
 def ToolDefDict(ConfDir):\r
     Target = TargetTxtDict(ConfDir)\r
     ToolDef = ToolDefClassObject()\r
-    if DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF in Target.TargetTxtDictionary:\r
-        ToolsDefFile = Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
+    if TAB_TAT_DEFINES_TOOL_CHAIN_CONF in Target.TargetTxtDictionary:\r
+        ToolsDefFile = Target.TargetTxtDictionary[TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
         if ToolsDefFile:\r
             ToolDef.LoadToolDefFile(os.path.normpath(ToolsDefFile))\r
         else:\r