BaseTools: Remove dsc nested include checking.

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

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 54c7d828305f7c58a42378280e622daf9c47909f..339b9986736907b52fa9c7b297f6da2642c01bb2 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -32,7 +32,7 @@ import Common.ToolDefClassObject as ToolDefClassObject
 from Common.DataType import *\r
 import Common.GlobalData as GlobalData\r
 from Common import EdkLogger\r
-from Common.String import *\r
+from Common.StringUtils import *\r
 from Common.Misc import DirCache, PathClass\r
 from Common.Misc import SaveFileOnChange\r
 from Common.Misc import ClearDuplicatedInf\r
@@ -315,7 +315,7 @@ def main():
                 for Fd in FdfParserObj.Profile.FdDict:\r
                     FdObj = FdfParserObj.Profile.FdDict[Fd]\r
                     for RegionObj in FdObj.RegionList:\r
-                        if RegionObj.RegionType != 'FV':\r
+                        if RegionObj.RegionType != BINARY_FILE_TYPE_FV:\r
                             continue\r
                         for RegionData in RegionObj.RegionDataList:\r
                             if FvObj.UiFvName.upper() == RegionData.upper():\r
@@ -405,7 +405,7 @@ def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):
                   KeyList[1] + \\r
                   '_' + \\r
                   KeyList[2]\r
-            if Key in KeyStringList and KeyList[4] == 'GUID':\r
+            if Key in KeyStringList and KeyList[4] == TAB_GUID:\r
                 ToolPathKey   = Key + '_' + KeyList[3] + '_PATH'\r
                 ToolOptionKey = Key + '_' + KeyList[3] + '_FLAGS'\r
                 ToolPath = ToolDefinition.get(ToolPathKey)\r
@@ -428,7 +428,7 @@ def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):
         if BuildOption:\r
             ToolList = [TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_TAG, TAB_TOD_DEFINES_TARGET_ARCH]\r
             for Index in range(2, -1, -1):\r
-                for Key in dict(BuildOption):\r
+                for Key in list(BuildOption.keys()):\r
                     List = Key.split('_')\r
                     if List[Index] == '*':\r
                         for String in ToolDb[ToolList[Index]]:\r
@@ -447,7 +447,7 @@ def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):
                 if NameGuid == BuildOption[Op]:\r
                     KeyList = Op.split('_')\r
                     Key = KeyList[0] + '_' + KeyList[1] +'_' + KeyList[2]\r
-                    if Key in KeyStringList and KeyList[4] == 'GUID':\r
+                    if Key in KeyStringList and KeyList[4] == TAB_GUID:\r
                         ToolPathKey   = Key + '_' + KeyList[3] + '_PATH'\r
                         ToolOptionKey = Key + '_' + KeyList[3] + '_FLAGS'\r
         if ToolPathKey in BuildOption:\r
@@ -589,7 +589,7 @@ class GenFds :
         if FdObj is None:\r
             for ElementFd in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
                 for ElementRegion in ElementFd.RegionList:\r
-                    if ElementRegion.RegionType == 'FV':\r
+                    if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:\r
                         for ElementRegionData in ElementRegion.RegionDataList:\r
                             if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:\r
                                 if FvObj.BlockSizeList != []:\r
@@ -601,7 +601,7 @@ class GenFds :
             return DefaultBlockSize\r
         else:\r
             for ElementRegion in FdObj.RegionList:\r
-                    if ElementRegion.RegionType == 'FV':\r
+                    if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:\r
                         for ElementRegionData in ElementRegion.RegionDataList:\r
                             if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:\r
                                 if FvObj.BlockSizeList != []:\r
@@ -761,7 +761,7 @@ class GenFds :
                                     length = F.tell()\r
                                     F.seek(4)\r
                                     TmpStr = unpack('%dh' % ((length - 4) / 2), F.read())\r
-                                    Name = ''.join([chr(c) for c in TmpStr[:-1]])\r
+                                    Name = ''.join(chr(c) for c in TmpStr[:-1])\r
                         else:\r
                             FileList = []\r
                             if 'fv.sec.txt' in MatchDict:\r