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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1526 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index df9c2422be262754058ab782f8d20d9bd3642fe9..d1bf1cc90aa3107b6aa057386666413bb5aa398f 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index b053bdd566787aa57d829906428840fa3de49fda..648526c8230a2a9abb02f10725542f78b9800257 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -35,7 +35,6 @@ import org.apache.xmlbeans.XmlObject;
 \r
 import org.tianocore.common.definitions.ToolDefinitions;\r
 import org.tianocore.common.exception.EdkException;\r
-import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.build.autogen.AutoGen;\r
 import org.tianocore.build.exception.AutoGenException;\r
 import org.tianocore.build.exception.GenBuildException;\r
@@ -270,7 +269,7 @@ public class GenBuildTask extends Ant {
             // Whether the module is built before\r
             //\r
             if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
-                EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
+                getProject().log(this, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n", Project.MSG_WARN);\r
                 continue;\r
             } else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
                 break;\r
@@ -295,7 +294,7 @@ public class GenBuildTask extends Ant {
                     // don't do anything if no tools found\r
                     //\r
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
-                        EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued.  No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
+                        getProject().log(this, "Warning: No build issued.  No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n", Project.MSG_WARN);\r
                         continue;\r
                     }\r
 \r
@@ -305,8 +304,8 @@ public class GenBuildTask extends Ant {
                     //\r
                     getProject().setProperty("TOOLCHAIN", toolchainList[j]);\r
 \r
-                    EdkLog.log(this, "Build " + moduleId + " start >>>");\r
-                    EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
+                    getProject().log(this, "Build " + moduleId + " start >>>", Project.MSG_INFO);\r
+                    getProject().log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k], Project.MSG_INFO);\r
                     saq.push(GlobalData.getDoc(fpdModuleId));\r
 \r
                     //\r
@@ -615,7 +614,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml");\r
+            getProject().log(this, "Call user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);\r
             \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, null);\r
@@ -645,7 +644,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
+            getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);\r
             \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, "clean");\r
@@ -663,7 +662,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
+            getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);\r
 \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, "cleanall");\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
index 3490c10ad8a784ac26acd3cfb0bf166cd7fcf5a4..01a387057b003e7311668aebb9a3e41aa0c6232f 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
@@ -152,7 +152,7 @@ public class GenBuildThread implements Runnable {
     \r
             genBuildTask.parentId = parentModuleId;\r
 \r
-            genBuildTask.execute();\r
+            genBuildTask.perform();\r
         } catch (BuildException be) {\r
 \r
             EdkLog.log("GenBuild", EdkLog.EDK_ALWAYS, moduleId + " with Arch " + arch +" build error. \n" + be.getMessage());\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index d867593244e93dc06efd7fd525de598818c523ed..19746407ab284d6e35b1f950e926601cd737a53a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -34,15 +34,15 @@ import java.util.Set;
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.xmlbeans.XmlObject;\r
-import org.tianocore.build.exception.*;\r
+import org.tianocore.build.exception.AutoGenException;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.global.SurfaceAreaQuery;\r
 import org.tianocore.build.id.ModuleIdentification;\r
 import org.tianocore.build.id.PackageIdentification;\r
 import org.tianocore.build.pcd.action.PCDAutoGenAction;\r
-import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.common.definitions.ToolDefinitions;\r
 import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.common.logger.EdkLog;\r
 \r
 /**\r
   This class is to generate Autogen.h and Autogen.c according to module surface\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index e52070c2ce3191893fd5363e220c57b9e85ba594..fb283fd4c650e03e27b44f85373511fb8c81385e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -165,7 +165,6 @@ public class GlobalData {
         EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Using tool definition file [" + toolsDefFile.getPath() + "].");\r
         toolsDef = new ToolChainConfig(toolsDefFile);\r
 \r
-\r
         //\r
         // Parse Framework Database\r
         //\r