Fix some bugs in PCD 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 1e3de2a4e6c467c8be0ae55d938a9156bc62544f..011e13de527af8a867d0d7b7f3dfc8a5809e32f9 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -783,20 +783,24 @@ public class FpdParserTask extends Task {
     }\r
 \r
     public void collectPCDInformation() {\r
-      CollectPCDAction collectAction = new CollectPCDAction ();\r
-      //\r
-      // Collect all PCD information from FPD to MSA, and get help information from SPD.\r
-      // These all information will be stored into memory database for future usage such \r
-      // as autogen.\r
-      //\r
-      try {\r
-        collectAction.perform (\r
-          getProject().getProperty("WORKSPACE_DIR"),\r
-          fpdFilename.getPath(),\r
-          ActionMessage.MAX_MESSAGE_LEVEL\r
-          );\r
-      } catch (Exception exp) {\r
-        throw new BuildException (String.format("Fail to do PCD preprocess from FPD file,  the cause is %s", exp.getMessage()));\r
-      }\r
+        String           exceptionString = null;\r
+        CollectPCDAction collectAction   = new CollectPCDAction ();\r
+        //\r
+        // Collect all PCD information from FPD to MSA, and get help information from SPD.\r
+        // These all information will be stored into memory database for future usage such \r
+        // as autogen.\r
+        //\r
+        try {\r
+            collectAction.perform (getProject().getProperty("WORKSPACE_DIR"),\r
+                                   fpdFilename.getPath(),\r
+                                   ActionMessage.MAX_MESSAGE_LEVEL\r
+                                   );\r
+        } catch (Exception exp) {\r
+            exceptionString = exp.getMessage();\r
+            if (exceptionString == null) {\r
+                exceptionString = "[Internal Error]Pcd tools catch a internel errors, Please report this bug into TianoCore or send email to Wang, scott or Lu, ken!";\r
+            }\r
+            throw new BuildException (String.format("Fail to do PCD preprocess from FPD file: %s", exceptionString));\r
+        }\r
     }\r
 }\r