Fixed EDKT370&372

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

3 files changed, 43 insertions, 13 deletions

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 53d5cea8bb..44eec53216 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -110,6 +110,7 @@ public class FrameworkBuildTask extends Task{
         // set Logger

         //

         GenBuildLogger logger = new GenBuildLogger(getProject());

+		EdkLog.setLogLevel(EdkLog.EDK_DEBUG);

         EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));

         EdkLog.setLogger(logger);

         

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
index c7bc01599b..85ba166871 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
@@ -44,7 +44,10 @@ import org.tianocore.common.logger.LogMethod;
 public class GenBuildLogger extends DefaultLogger implements LogMethod {

     

     Project project = null;

-

+	///

+    /// Time of the start of the build 

+	/// 

+    private long startTime = System.currentTimeMillis();

     ///

     /// flag to present whether cache all msg or not

     /// true means to cache.

@@ -76,7 +79,6 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
         if (this.project == null) {

             return;

         }

-

         //

         // If msgLevel is always print, then print it

         //

@@ -96,7 +98,7 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
         case EdkLog.EDK_INFO:

             log(msgSource, msg, Project.MSG_INFO);

             break;

-        case EdkLog.EDK_VERBOSE:

+		case EdkLog.EDK_VERBOSE:

             log(msgSource, msg, Project.MSG_VERBOSE);

             break;

         case EdkLog.EDK_DEBUG:

@@ -179,10 +181,7 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
     }

     

     public void messageLogged(BuildEvent event) {

-        if (!enableFlag) {

-            return ;

-        }

-        int currentLevel = event.getPriority();

+		int currentLevel = event.getPriority();

         //

         // If current level is upper than Ant Level, skip it

         //

@@ -271,4 +270,40 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
     public void setId(FpdModuleIdentification id) {

         this.id = id;

     }

+

+    public void buildFinished(BuildEvent event) {

+        Throwable error = event.getException();

+        StringBuffer message = new StringBuffer();

+

+        if (error == null) {

+            message.append(StringUtils.LINE_SEP);

+            message.append("BUILD SUCCESSFUL");

+        } else {

+            message.append(StringUtils.LINE_SEP);

+            message.append("BUILD FAILED");

+            message.append(StringUtils.LINE_SEP);

+

+            if (Project.MSG_DEBUG <= msgOutputLevel

+                || !(error instanceof BuildException)) {

+                message.append(StringUtils.getStackTrace(error));

+            } else {

+                if (error instanceof BuildException) {

+                    message.append(error.toString()).append(lSep);

+                } else {

+                    message.append(error.getMessage()).append(lSep);

+                }

+            }

+        }

+        message.append(StringUtils.LINE_SEP);

+        message.append("Total time: ");

+        message.append(formatTime(System.currentTimeMillis() - startTime));

+

+        String msg = message.toString();

+        if (error == null) {

+            printMessage(msg, out, Project.MSG_VERBOSE);

+        } else {

+            printMessage(msg, err, Project.MSG_ERR);

+        }

+        log(msg);

+    }

 }
\ No newline at end of file
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 0140e8b704..1e95eb2b1a 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -1828,9 +1828,6 @@ public class SurfaceAreaQuery {
             guidPair[0] = entry.getCName();

             guidPair[1] = entry.getGuidValue();

             guidDeclMap.put(entry.getCName(), guidPair);

-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());

-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[0]);

-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[1]);

         }

         return guidDeclMap;

     }

@@ -1859,9 +1856,6 @@ public class SurfaceAreaQuery {
             protocolPair[0] = entry.getCName();

             protocolPair[1] = entry.getGuidValue();

             protoclMap.put(entry.getCName(), protocolPair);

-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());

-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[0]);

-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[1]);

         }

         return protoclMap;

     }