## @file\r
# process depex section generation\r
#\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# @param Dict dictionary contains macro and its value\r
# @retval tuple (Generated file name list, section alignment)\r
#\r
- def GenSection(self, OutputPath, ModuleName, SecNum, keyStringList, FfsFile = None, Dict = {}, IsMakefile = False):\r
- \r
+ def GenSection(self, OutputPath, ModuleName, SecNum, keyStringList, FfsFile = None, Dict = None, IsMakefile = False):\r
if self.ExpressionProcessed == False:\r
self.Expression = self.Expression.replace("\n", " ").replace("\r", " ")\r
ExpList = self.Expression.split()\r
- ExpGuidDict = {}\r
\r
for Exp in ExpList:\r
if Exp.upper() not in ('AND', 'OR', 'NOT', 'TRUE', 'FALSE', 'SOR', 'BEFORE', 'AFTER', 'END'):\r
EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE,\r
"Depex GUID %s could not be found in build DB! (ModuleName: %s)" % (Exp, ModuleName))\r
\r
- ExpGuidDict[Exp] = GuidStr\r
-\r
- for Item in ExpGuidDict:\r
- self.Expression = self.Expression.replace(Item, ExpGuidDict[Item])\r
+ self.Expression = self.Expression.replace(Exp, GuidStr)\r
\r
self.Expression = self.Expression.strip()\r
self.ExpressionProcessed = True\r
OutputFile = os.path.normpath(OutputFile)\r
\r
GenFdsGlobalVariable.GenerateSection(OutputFile, [InputFile], Section.Section.SectionType.get (SecType), IsMakefile=IsMakefile)\r
- FileList = [OutputFile]\r
- return FileList, self.Alignment\r
+ return [OutputFile], self.Alignment\r