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 14103d7b22f3f076d7abd77c3003973c3c437a15..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
@@ -263,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
@@ -275,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
@@ -420,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