Fix EDKT256: using unified logging mechanism in PcdAutogen tools.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / fpd / FpdParserTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 106e6d6a072eec091ac5c0f94d7fb7869d773994..2b1f30fa0d34b738b6d868a9428ba165fbad1f94 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -37,7 +37,6 @@ import org.apache.xmlbeans.XmlObject;
 import org.tianocore.common.definitions.EdkDefinitions;\r
 import org.tianocore.common.exception.EdkException;\r
 import org.tianocore.common.logger.EdkLog;\r
-import org.tianocore.pcd.action.ActionMessage;\r
 import org.tianocore.build.FrameworkBuildTask;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.global.OutputManager;\r
@@ -283,17 +282,20 @@ public class FpdParserTask extends Task {
                 Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i]);\r
                 \r
                 FpdModuleIdentification[] files = null;\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
-                    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
@@ -451,7 +453,7 @@ public class FpdParserTask extends Task {
             // Pcd Collection. Call CollectPCDAction to collect pcd info.\r
             //\r
             PlatformPcdPreprocessActionForBuilding ca = new PlatformPcdPreprocessActionForBuilding();\r
-            ca.perform(platformId.getFpdFile().getPath(), ActionMessage.NULL_MESSAGE_LEVEL);\r
+            ca.perform(platformId.getFpdFile().getPath());\r
         } catch (IOException ex) {\r
             BuildException buildException = new BuildException("Parsing of the FPD file [" + fpdFile.getPath() + "] failed!\n" + ex.getMessage());\r
             buildException.setStackTrace(ex.getStackTrace());\r