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

5 files changed, 11 insertions, 12 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index df9c2422be..d1bf1cc90a 100644
--- 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)

         //

         else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {

+            multithread = false; 

             File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);

             EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");

             EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> ");

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index b053bdd566..648526c823 100644
--- 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;
 

 import org.tianocore.common.definitions.ToolDefinitions;

 import org.tianocore.common.exception.EdkException;

-import org.tianocore.common.logger.EdkLog;

 import org.tianocore.build.autogen.AutoGen;

 import org.tianocore.build.exception.AutoGenException;

 import org.tianocore.build.exception.GenBuildException;

@@ -270,7 +269,7 @@ public class GenBuildTask extends Ant {
             // Whether the module is built before

             //

             if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {

-                EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");

+                getProject().log(this, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n", Project.MSG_WARN);

                 continue;

             } else if (GlobalData.isModuleBuilt(fpdModuleId)) {

                 break;

@@ -295,7 +294,7 @@ public class GenBuildTask extends Ant {
                     // don't do anything if no tools found

                     //

                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {

-                        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");

+                        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);

                         continue;

                     }

 

@@ -305,8 +304,8 @@ public class GenBuildTask extends Ant {
                     //

                     getProject().setProperty("TOOLCHAIN", toolchainList[j]);

 

-                    EdkLog.log(this, "Build " + moduleId + " start >>>");

-                    EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);

+                    getProject().log(this, "Build " + moduleId + " start >>>", Project.MSG_INFO);

+                    getProject().log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k], Project.MSG_INFO);

                     saq.push(GlobalData.getDoc(fpdModuleId));

 

                     //

@@ -615,7 +614,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.

         //

         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {

-            EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml");

+            getProject().log(this, "Call user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);

             

             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";

             antCall(antFilename, null);

@@ -645,7 +644,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.

         //

         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {

-            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");

+            getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);

             

             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";

             antCall(antFilename, "clean");

@@ -663,7 +662,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.

         //

         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {

-            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");

+            getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);

 

             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";

             antCall(antFilename, "cleanall");

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
index 3490c10ad8..01a387057b 100644
--- 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 {
     

             genBuildTask.parentId = parentModuleId;

 

-            genBuildTask.execute();

+            genBuildTask.perform();

         } catch (BuildException be) {

 

             EdkLog.log("GenBuild", EdkLog.EDK_ALWAYS, moduleId + " with Arch " + arch +" build error. \n" + be.getMessage());

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index d867593244..19746407ab 100644
--- 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;
 

 import org.apache.tools.ant.BuildException;

 import org.apache.xmlbeans.XmlObject;

-import org.tianocore.build.exception.*;

+import org.tianocore.build.exception.AutoGenException;

 import org.tianocore.build.global.GlobalData;

 import org.tianocore.build.global.SurfaceAreaQuery;

 import org.tianocore.build.id.ModuleIdentification;

 import org.tianocore.build.id.PackageIdentification;

 import org.tianocore.build.pcd.action.PCDAutoGenAction;

-import org.tianocore.common.logger.EdkLog;

 import org.tianocore.common.definitions.ToolDefinitions;

 import org.tianocore.common.exception.EdkException;

+import org.tianocore.common.logger.EdkLog;

 

 /**

   This class is to generate Autogen.h and Autogen.c according to module surface

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index e52070c2ce..fb283fd4c6 100644
--- 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() + "].");

         toolsDef = new ToolChainConfig(toolsDefFile);

 

-

         //

         // Parse Framework Database

         //