Update GlobalData, SPD, SurfaceAreaQuery to using EdkException.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 9d68419aa8bc24365f7a037d55bca59a6a3286ad..14103d7b22f3f076d7abd77c3003973c3c437a15 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -111,6 +111,13 @@ public class FrameworkBuildTask extends Task{
     private String type = "all";\r
     \r
     public void execute() throws BuildException {\r
+        //\r
+        // set Logger\r
+        //\r
+        GenBuildLogger logger = new GenBuildLogger(getProject());\r
+        EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
+        EdkLog.setLogger(logger);\r
+        \r
         try {\r
             processFrameworkBuild();\r
         } catch (PcdAutogenException e) {\r
@@ -142,13 +149,6 @@ public class FrameworkBuildTask extends Task{
     }\r
     \r
     private void processFrameworkBuild() throws EdkException, GenBuildException, AutoGenException, PcdAutogenException, PlatformPcdPreprocessBuildException {\r
-        //\r
-        // set Logger\r
-        //\r
-        GenBuildLogger logger = new GenBuildLogger(getProject());\r
-        EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-\r
         //\r
         // Seach build.xml -> .FPD -> .MSA file\r
         //\r
@@ -180,8 +180,10 @@ public class FrameworkBuildTask extends Task{
                     }\r
                 }\r
             }\r
-        } catch (IOException e) {\r
-            throw new BuildException(e.getMessage());\r
+        } catch (IOException ex) {\r
+            BuildException buildException = new BuildException("Scanning current directory error. \n" + ex.getMessage());\r
+            buildException.setStackTrace(ex.getStackTrace());\r
+            throw buildException;\r
         }\r
         \r
         //\r
@@ -426,7 +428,7 @@ public class FrameworkBuildTask extends Task{
                 if (threadNum > 0) {\r
                     MAX_CONCURRENT_THREAD_NUMBER = threadNum;\r
                 }\r
-            } catch (Exception enuma) {\r
+            } catch (Exception ex) {\r
             }\r
         }\r
     }\r