tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: defaultdict(set) allows us to just add to the set 

New sets will get created automatically when needed

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-04-06 07:13:51 +08:00 committed by Yonghong Zhu
parent eb2c0b2c80
commit a993dc03ab
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -46,6 +46,7 @@ import datetime
import hashlib import hashlib
from GenVar import VariableMgr,var_info from GenVar import VariableMgr,var_info
from collections import OrderedDict from collections import OrderedDict
from collections import defaultdict
## Regular expression for splitting Dependency Expression string into tokens ## Regular expression for splitting Dependency Expression string into tokens
gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)") gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")
@ -3483,8 +3484,8 @@ class ModuleAutoGen(AutoGen):
if self._BuildTargets is None: if self._BuildTargets is None:
self._IntroBuildTargetList = set() self._IntroBuildTargetList = set()
self._FinalBuildTargetList = set() self._FinalBuildTargetList = set()
self._BuildTargets = {} self._BuildTargets = defaultdict(set)
self._FileTypes = {} self._FileTypes = defaultdict(set)
SubDirectory = os.path.join(self.OutputDir, File.SubDir) SubDirectory = os.path.join(self.OutputDir, File.SubDir)
if not os.path.exists(SubDirectory): if not os.path.exists(SubDirectory):
@ -3521,8 +3522,6 @@ class ModuleAutoGen(AutoGen):
break break
FileType = RuleObject.SourceFileType FileType = RuleObject.SourceFileType
if FileType not in self._FileTypes:
self._FileTypes[FileType] = set()
self._FileTypes[FileType].add(Source) self._FileTypes[FileType].add(Source)
# stop at STATIC_LIBRARY for library # stop at STATIC_LIBRARY for library
@ -3540,8 +3539,6 @@ class ModuleAutoGen(AutoGen):
# Only do build for target with outputs # Only do build for target with outputs
self._FinalBuildTargetList.add(Target) self._FinalBuildTargetList.add(Target)
if FileType not in self._BuildTargets:
self._BuildTargets[FileType] = set()
self._BuildTargets[FileType].add(Target) self._BuildTargets[FileType].add(Target)
if not Source.IsBinary and Source == File: if not Source.IsBinary and Source == File:
@ -3560,8 +3557,8 @@ class ModuleAutoGen(AutoGen):
if self._BuildTargets is None: if self._BuildTargets is None:
self._IntroBuildTargetList = set() self._IntroBuildTargetList = set()
self._FinalBuildTargetList = set() self._FinalBuildTargetList = set()
self._BuildTargets = {} self._BuildTargets = defaultdict(set)
self._FileTypes = {} self._FileTypes = defaultdict(set)
#TRICK: call _GetSourceFileList to apply build rule for source files #TRICK: call _GetSourceFileList to apply build rule for source files
if self.SourceFileList: if self.SourceFileList: