Auto close multi-thread flag when stand-alone module build. Also change some logs.

[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..d1bf1cc90aa3107b6aa057386666413bb5aa398f 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -103,7 +103,7 @@ public class FrameworkBuildTask extends Task{
     ///\r
     /// The concurrent thread number\r
     ///\r
-    public static int MAX_CONCURRENT_THREAD_NUMBER = 1;\r
+    public static int MAX_CONCURRENT_THREAD_NUMBER = 2;\r
 \r
     ///\r
     /// there are three type: all (build), clean and cleanall\r
@@ -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
@@ -261,7 +263,7 @@ public class FrameworkBuildTask extends Task{
             //\r
             if (type.compareTo("cleanall") == 0) {\r
                 File platformBuildFile = \r
-                    new File(getProject().getProperty("PLATFORM_DIR") \r
+                    new File(getProject().getProperty("BUILD_DIR") \r
                                     + File.separatorChar \r
                                     + getProject().getProperty("PLATFORM") \r
                                     + "_build.xml");\r
@@ -273,6 +275,7 @@ public class FrameworkBuildTask extends Task{
         // Build every MSA files (SINGLE MODULE BUILD)\r
         //\r
         else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {\r
+            multithread = false; \r
             File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
             EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
             EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
@@ -418,7 +421,7 @@ public class FrameworkBuildTask extends Task{
         if (str != null && str.trim().equalsIgnoreCase("Enable")) {\r
             multithread = true;\r
         }\r
-            \r
+\r
         str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
         if (str != null ) {\r
             try {\r
@@ -426,7 +429,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