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
@staticmethod\r
def GetBuildRules(Inf, Arch):\r
if not Arch:\r
- Arch = 'COMMON'\r
+ Arch = DataType.TAB_COMMON\r
\r
if not Arch in GenFdsGlobalVariable.OutputDirDict:\r
return {}\r
FileList.append((File, DataType.TAB_UNKNOWN_FILE))\r
\r
for File in Inf.Binaries:\r
- if File.Target in ['COMMON', '*', GenFdsGlobalVariable.TargetName]:\r
+ if File.Target in [DataType.TAB_COMMON, '*', GenFdsGlobalVariable.TargetName]:\r
FileList.append((File, File.Type))\r
\r
for File, FileType in FileList:\r
Source = SourceList[Index]\r
Index = Index + 1\r
\r
- if File.IsBinary and File == Source and Inf.Binaries != None and File in Inf.Binaries:\r
+ if File.IsBinary and File == Source and Inf.Binaries is not None and File in Inf.Binaries:\r
# Skip all files that are not binary libraries\r
if not Inf.LibraryClass:\r
continue \r
# 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
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
if not os.path.exists(Output):\r
return True\r
# always update "Output" if no "Input" given\r
- if Input == None or len(Input) == 0:\r
+ if Input is None or len(Input) == 0:\r
return True\r
\r
# if fdf file is changed after the 'Output" is generated, update the 'Output'\r
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 != None:\r
+ if Guid is not None:\r
Cmd += ["-g", Guid]\r
- if DummyFile != None:\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
for Attr in GuidAttr:\r
Cmd += ["-r", Attr]\r
- if InputAlign != None:\r
+ if InputAlign is not None:\r
#Section Align is only for dummy section without section type\r
for SecAlign in InputAlign:\r
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
- Cmd += ["-n", "$(MODULE_NAME)"]\r
+ if Ui == "$(MODULE_NAME)":\r
+ Cmd += ['-n', Ui]\r
+ else:\r
+ Cmd += ["-n", '"' + Ui + '"']\r
Cmd += ["-o", Output]\r
- #SaveFileOnChange(CommandFile, ' '.join(Cmd), False)\r
if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())\r
else:\r
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
\r
@staticmethod\r
def GetAlignment (AlignString):\r
- if AlignString == None:\r
+ if AlignString is None:\r
return 0\r
if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K", "512K"):\r
return int (AlignString.rstrip('K')) * 1024\r
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
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
\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
if MakefilePath:\r
- if (tuple(Cmd),tuple(GenFdsGlobalVariable.SecCmdList),tuple(GenFdsGlobalVariable.CopyList)) not in GenFdsGlobalVariable.FfsCmdDict.keys():\r
+ if (tuple(Cmd),tuple(GenFdsGlobalVariable.SecCmdList),tuple(GenFdsGlobalVariable.CopyList)) not in GenFdsGlobalVariable.FfsCmdDict:\r
GenFdsGlobalVariable.FfsCmdDict[tuple(Cmd), tuple(GenFdsGlobalVariable.SecCmdList), tuple(GenFdsGlobalVariable.CopyList)] = MakefilePath\r
GenFdsGlobalVariable.SecCmdList = []\r
GenFdsGlobalVariable.CopyList = []\r
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
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
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
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
return\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, InputList))\r
\r
- if ClassCode != None:\r
+ if ClassCode is not None:\r
Cmd += ["-l", ClassCode]\r
- if Revision != None:\r
+ if Revision is not None:\r
Cmd += ["-r", Revision]\r
- if DeviceId != None:\r
+ if DeviceId is not None:\r
Cmd += ["-i", DeviceId]\r
- if VendorId != None:\r
+ if VendorId is not None:\r
Cmd += ["-f", VendorId]\r
\r
Cmd += ["-o", Output]\r
EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))\r
(out, error) = PopenObject.communicate()\r
\r
- while PopenObject.returncode == None :\r
+ while PopenObject.returncode is None :\r
PopenObject.wait()\r
if returnValue != [] and returnValue[0] != 0:\r
#get command return value\r
# @param Str String that may contain macro\r
# @param MacroDict Dictionary that contains macro value pair\r
#\r
- def MacroExtend (Str, MacroDict={}, Arch='COMMON'):\r
- if Str == None :\r
+ def MacroExtend (Str, MacroDict={}, Arch=DataType.TAB_COMMON):\r
+ if Str is None :\r
return None\r
\r
Dict = {'$(WORKSPACE)' : GenFdsGlobalVariable.WorkSpaceDir,\r
'$(SPACE)' : ' '\r
}\r
OutputDir = GenFdsGlobalVariable.OutputDirFromDscDict[GenFdsGlobalVariable.ArchList[0]]\r
- if Arch != 'COMMON' and Arch in GenFdsGlobalVariable.ArchList:\r
+ if Arch != DataType.TAB_COMMON and Arch in GenFdsGlobalVariable.ArchList:\r
OutputDir = GenFdsGlobalVariable.OutputDirFromDscDict[Arch]\r
\r
Dict['$(OUTPUT_DIRECTORY)'] = OutputDir\r
\r
- if MacroDict != None and len (MacroDict) != 0:\r
+ if MacroDict is not None and len (MacroDict) != 0:\r
Dict.update(MacroDict)\r
\r
- for key in Dict.keys():\r
+ for key in Dict:\r
if Str.find(key) >= 0 :\r
Str = Str.replace (key, Dict[key])\r
\r
# @param PcdPattern pattern that labels a PCD.\r
#\r
def GetPcdValue (PcdPattern):\r
- if PcdPattern == None :\r
+ if PcdPattern is None :\r
return None\r
PcdPair = PcdPattern.lstrip('PCD(').rstrip(')').strip().split('.')\r
TokenSpace = PcdPair[0]\r
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
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