summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8d6ff41)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1624
6f19259b-4bc3-4df7-8a09-
765794883524
Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i]);\r
\r
FpdModuleIdentification[] files = null;\r
Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i]);\r
\r
FpdModuleIdentification[] files = null;\r
if (moduleSeqSet == null) {\r
if (filesSet != null) {\r
files = filesSet.toArray(new FpdModuleIdentification[filesSet.size()]);\r
}\r
if (moduleSeqSet == null) {\r
if (filesSet != null) {\r
files = filesSet.toArray(new FpdModuleIdentification[filesSet.size()]);\r
}\r
+ } else if (filesSet == null) {\r
+ if (moduleSeqSet.size() != 0) {\r
+ throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']");\r
+ }\r
} else {\r
//\r
// if moduleSeqSet and filesSet is inconsistent, report error\r
//\r
} else {\r
//\r
// if moduleSeqSet and filesSet is inconsistent, report error\r
//\r
- if (filesSet == null && moduleSeqSet.size() != 0) {\r
- throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']");\r
- } else if(moduleSeqSet.size() != filesSet.size()){\r
+ if(moduleSeqSet.size() != filesSet.size()){\r
throw new BuildException("Modules for FV[" + validFv[i] + "] defined in FrameworkModules and in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1'] are inconsistent. ");\r
} else {\r
//\r
throw new BuildException("Modules for FV[" + validFv[i] + "] defined in FrameworkModules and in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1'] are inconsistent. ");\r
} else {\r
//\r