From 5c1edc553492d031d66ac2bfcf134d72e513c415 Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Tue, 8 Dec 2015 03:06:41 +0000 Subject: [PATCH] Revert the change in r19143 for BUILDRULEORDER. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19150 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/AutoGen/AutoGen.py | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index cf0b4466f9..4c627dfb55 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -2713,36 +2713,9 @@ class ModuleAutoGen(AutoGen): if F.Dir not in self.IncludePathList and self.AutoGenVersion >= 0x00010005: self.IncludePathList.insert(0, F.Dir) self._SourceFileList.append(F) - - self._MatchBuildRuleOrder(self._SourceFileList) - - for F in self._SourceFileList: self._ApplyBuildRule(F, TAB_UNKNOWN_FILE) return self._SourceFileList - def _MatchBuildRuleOrder(self, FileList): - Order_Dict = {} - self._GetModuleBuildOption() - for SingleFile in FileList: - if self.BuildRuleOrder and SingleFile.Ext in self.BuildRuleOrder: - key = SingleFile.Path.split(SingleFile.Ext)[0] - if key in Order_Dict: - Order_Dict[key].append(SingleFile.Ext) - else: - Order_Dict[key] = [SingleFile.Ext] - - RemoveList = [] - for F in Order_Dict: - if len(Order_Dict[F]) > 1: - Order_Dict[F].sort(key=lambda i: self.BuildRuleOrder.index(i)) - for Ext in Order_Dict[F][1:]: - RemoveList.append(F + Ext) - - for item in RemoveList: - FileList.remove(item) - - return FileList - ## Return the list of unicode files def _GetUnicodeFileList(self): if self._UnicodeFileList == None: -- 2.39.2