Revision: 19380
http://sourceforge.net/p/edk2/code/19380
Author: vanjeff
Date: 2015-12-18 06:51:00 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
Revert the change in r19143 for BUILDRULEORDER.
(Sync patch r19150 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19143
http://sourceforge.net/p/edk2/code/19150
Modified Paths:
--------------
branches/UDK2015/BaseTools/Source/Python/AutoGen/AutoGen.py
Modified: branches/UDK2015/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- branches/UDK2015/BaseTools/Source/Python/AutoGen/AutoGen.py 2015-12-18
06:50:15 UTC (rev 19379)
+++ branches/UDK2015/BaseTools/Source/Python/AutoGen/AutoGen.py 2015-12-18
06:51:00 UTC (rev 19380)
@@ -2713,36 +2713,9 @@
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:
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
