BaseTools: loop to retry remove when it fails.

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

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 6a3873940ec01452a2bdcdb8181cb27efcccdeaf..6cf82526efd2b9bcb488ba723b3bd66936d76101 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -102,7 +102,7 @@ class GenFdsGlobalVariable:
             TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
             if DataType.TAB_TAT_DEFINES_BUILD_RULE_CONF in TargetTxt.TargetTxtDictionary:\r
                 BuildRuleFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
-            if BuildRuleFile in [None, '']:\r
+            if not BuildRuleFile:\r
                 BuildRuleFile = 'Conf/build_rule.txt'\r
             GenFdsGlobalVariable.__BuildRuleDatabase = BuildRule(BuildRuleFile)\r
             ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
@@ -288,7 +288,7 @@ class GenFdsGlobalVariable:
 #        GenFdsGlobalVariable.OutputDirDict = OutputDir\r
         GenFdsGlobalVariable.FdfParser = FdfParser\r
         GenFdsGlobalVariable.WorkSpace = WorkSpace\r
-        GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], 'FV')\r
+        GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)\r
         if not os.path.exists(GenFdsGlobalVariable.FvDir) :\r
             os.makedirs(GenFdsGlobalVariable.FvDir)\r
         GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
@@ -349,7 +349,7 @@ class GenFdsGlobalVariable:
             GenFdsGlobalVariable.PlatformName = WorkSpace.Db.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,\r
                                                                       GlobalData.gGlobalDefines['TARGET'],\r
                                                                       GlobalData.gGlobalDefines['TOOLCHAIN']].PlatformName\r
-        GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], 'FV')\r
+        GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)\r
         if not os.path.exists(GenFdsGlobalVariable.FvDir):\r
             os.makedirs(GenFdsGlobalVariable.FvDir)\r
         GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
@@ -441,15 +441,15 @@ class GenFdsGlobalVariable:
     def GenerateSection(Output, Input, Type=None, CompressionType=None, Guid=None,\r
                         GuidHdrLen=None, GuidAttr=[], Ui=None, Ver=None, InputAlign=None, BuildNumber=None, DummyFile=None, IsMakefile=False):\r
         Cmd = ["GenSec"]\r
-        if Type not in [None, '']:\r
+        if Type:\r
             Cmd += ["-s", Type]\r
-        if CompressionType not in [None, '']:\r
+        if CompressionType:\r
             Cmd += ["-c", CompressionType]\r
         if Guid is not None:\r
             Cmd += ["-g", Guid]\r
         if DummyFile is not None:\r
             Cmd += ["--dummy", DummyFile]\r
-        if GuidHdrLen not in [None, '']:\r
+        if GuidHdrLen:\r
             Cmd += ["-l", GuidHdrLen]\r
         if len(GuidAttr) != 0:\r
             #Add each guided attribute\r
@@ -461,7 +461,7 @@ class GenFdsGlobalVariable:
                 Cmd += ["--sectionalign", SecAlign]\r
 \r
         CommandFile = Output + '.txt'\r
-        if Ui not in [None, '']:\r
+        if Ui:\r
             #Cmd += ["-n", '"' + Ui + '"']\r
             if IsMakefile:\r
                 if Ui == "$(MODULE_NAME)":\r
@@ -480,7 +480,7 @@ class GenFdsGlobalVariable:
                 GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)\r
                 SaveFileOnChange(Output, SectionData.tostring())\r
 \r
-        elif Ver not in [None, '']:\r
+        elif Ver:\r
             Cmd += ["-n", Ver]\r
             if BuildNumber:\r
                 Cmd += ["-j", BuildNumber]\r
@@ -529,7 +529,7 @@ class GenFdsGlobalVariable:
             Cmd += ["-x"]\r
         if CheckSum:\r
             Cmd += ["-s"]\r
-        if Align not in [None, '']:\r
+        if Align:\r
             if Align not in mFfsValidAlign:\r
                 Align = GenFdsGlobalVariable.GetAlignment (Align)\r
                 for index in range(0, len(mFfsValidAlign) - 1):\r
@@ -541,7 +541,7 @@ class GenFdsGlobalVariable:
         Cmd += ["-o", Output]\r
         for I in range(0, len(Input)):\r
             Cmd += ("-i", Input[I])\r
-            if SectionAlign not in [None, '', []] and SectionAlign[I] not in [None, '']:\r
+            if SectionAlign and SectionAlign[I]:\r
                 Cmd += ("-n", SectionAlign[I])\r
 \r
         CommandFile = Output + '.txt'\r
@@ -566,7 +566,7 @@ class GenFdsGlobalVariable:
         GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
 \r
         Cmd = ["GenFv"]\r
-        if BaseAddress not in [None, '']:\r
+        if BaseAddress:\r
             Cmd += ["-r", BaseAddress]\r
 \r
         if ForceRebase == False:\r
@@ -578,9 +578,9 @@ class GenFdsGlobalVariable:
             Cmd += ["-c"]\r
         if Dump:\r
             Cmd += ["-p"]\r
-        if AddressFile not in [None, '']:\r
+        if AddressFile:\r
             Cmd += ["-a", AddressFile]\r
-        if MapFile not in [None, '']:\r
+        if MapFile:\r
             Cmd += ["-m", MapFile]\r
         if FileSystemGuid:\r
             Cmd += ["-g", FileSystemGuid]\r
@@ -597,7 +597,7 @@ class GenFdsGlobalVariable:
         GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
 \r
         Cmd = ["GenVtf"]\r
-        if BaseAddress not in [None, ''] and FvSize not in [None, ''] \\r
+        if BaseAddress and FvSize \\r
             and len(BaseAddress) == len(FvSize):\r
             for I in range(0, len(BaseAddress)):\r
                 Cmd += ["-r", BaseAddress[I], "-s", FvSize[I]]\r
@@ -618,13 +618,13 @@ class GenFdsGlobalVariable:
         Cmd = ["GenFw"]\r
         if Type.lower() == "te":\r
             Cmd += ["-t"]\r
-        if SubType not in [None, '']:\r
+        if SubType:\r
             Cmd += ["-e", SubType]\r
-        if TimeStamp not in [None, '']:\r
+        if TimeStamp:\r
             Cmd += ["-s", TimeStamp]\r
-        if Align not in [None, '']:\r
+        if Align:\r
             Cmd += ["-a", Align]\r
-        if Padding not in [None, '']:\r
+        if Padding:\r
             Cmd += ["-p", Padding]\r
         if Zero:\r
             Cmd += ["-z"]\r
@@ -809,9 +809,9 @@ class GenFdsGlobalVariable:
             for Key in PcdDict:\r
                 PcdObj = PcdDict[Key]\r
                 if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):\r
-                    if PcdObj.Type != 'FixedAtBuild':\r
+                    if PcdObj.Type != DataType.TAB_PCDS_FIXED_AT_BUILD:\r
                         EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)\r
-                    if PcdObj.DatumType != 'VOID*':\r
+                    if PcdObj.DatumType != DataType.TAB_VOID:\r
                         EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)\r
                         \r
                     PcdValue = PcdObj.DefaultValue\r
@@ -825,9 +825,9 @@ class GenFdsGlobalVariable:
                 for Key in PcdDict:\r
                     PcdObj = PcdDict[Key]\r
                     if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):\r
-                        if PcdObj.Type != 'FixedAtBuild':\r
+                        if PcdObj.Type != DataType.TAB_PCDS_FIXED_AT_BUILD:\r
                             EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)\r
-                        if PcdObj.DatumType != 'VOID*':\r
+                        if PcdObj.DatumType != DataType.TAB_VOID:\r
                             EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)\r
                             \r
                         PcdValue = PcdObj.DefaultValue\r