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

Disp dependencies in error in case of circular dependency 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2245 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
tgingold 2007-01-12 23:22:29 +00:00
parent b28d0bd1d2
commit b991a45139
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
View File

@ -231,17 +231,28 @@ public class AutogenLibOrder {
// //
// Append the remaining library instance to the end of sorted list // Append the remaining library instance to the end of sorted list
// //
boolean HasError = false;
for (int i = 0; i < libInstanceList.length; ++i) { for (int i = 0; i < libInstanceList.length; ++i) {
if (libInstanceConsumedBy.get(libInstanceList[i]).size() > 0 && libInstanceList[i].hasConstructor()) { HashSet<ModuleIdentification> consumedBy = libInstanceConsumedBy.get(libInstanceList[i]);
if (consumedBy.size() > 0 && libInstanceList[i].hasConstructor()) {
EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName() EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()
+ " with constructor has a circular dependency!"); + " with constructor has a circular dependency!");
throw new AutoGenException("Circular dependency in library instances is found!"); ModuleIdentification[] consumedByList = consumedBy.toArray(new ModuleIdentification[consumedBy.size()]);
for (int j = 0; j < consumedByList.length; ++j) {
EdkLog.log(EdkLog.EDK_ERROR,
" consumed by " + consumedByList[j].getName());
}
HasError = true;
} }
if (!orderList.contains(libInstanceList[i])) { if (!orderList.contains(libInstanceList[i])) {
orderList.add(libInstanceList[i]); orderList.add(libInstanceList[i]);
} }
} }
if (HasError) {
throw new AutoGenException("Circular dependency in library instances is found!");
}
return orderList; return orderList;
} }
} }