Fixed EDKT370&372

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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 53d5cea8bb1e11c89dea571673207025290cea1f..44eec532169a1c8260ac31a7afe46098fc9db68c 100644 (file)
--- 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\r
         //\r
         GenBuildLogger logger = new GenBuildLogger(getProject());\r
         // set Logger\r
         //\r
         GenBuildLogger logger = new GenBuildLogger(getProject());\r

+               EdkLog.setLogLevel(EdkLog.EDK_DEBUG);\r

         EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         \r
         EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         \r

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 c7bc01599b95c5689cd33bdb5d4f001b1a83f874..85ba166871ecebefd2d7fa6880c4bf2972ed1118 100644 (file)
--- 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 {\r
     \r
     Project project = null;\r
 public class GenBuildLogger extends DefaultLogger implements LogMethod {\r
     \r
     Project project = null;\r

-\r
+       ///\r
+    /// Time of the start of the build \r
+       /// \r
+    private long startTime = System.currentTimeMillis();\r

     ///\r
     /// flag to present whether cache all msg or not\r
     /// true means to cache.\r
     ///\r
     /// flag to present whether cache all msg or not\r
     /// true means to cache.\r


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

-\r

         //\r
         // If msgLevel is always print, then print it\r
         //\r
         //\r
         // If msgLevel is always print, then print it\r
         //\r


@@ -96,7 +98,7 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
         case EdkLog.EDK_INFO:\r
             log(msgSource, msg, Project.MSG_INFO);\r
             break;\r
         case EdkLog.EDK_INFO:\r
             log(msgSource, msg, Project.MSG_INFO);\r
             break;\r

-        case EdkLog.EDK_VERBOSE:\r
+               case EdkLog.EDK_VERBOSE:\r

             log(msgSource, msg, Project.MSG_VERBOSE);\r
             break;\r
         case EdkLog.EDK_DEBUG:\r
             log(msgSource, msg, Project.MSG_VERBOSE);\r
             break;\r
         case EdkLog.EDK_DEBUG:\r


@@ -179,10 +181,7 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
     }\r
     \r
     public void messageLogged(BuildEvent event) {\r
     }\r
     \r
     public void messageLogged(BuildEvent event) {\r

-        if (!enableFlag) {\r
-            return ;\r
-        }\r
-        int currentLevel = event.getPriority();\r
+               int currentLevel = event.getPriority();\r

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


@@ -271,4 +270,40 @@ public class GenBuildLogger extends DefaultLogger implements LogMethod {
     public void setId(FpdModuleIdentification id) {\r
         this.id = id;\r
     }\r
     public void setId(FpdModuleIdentification id) {\r
         this.id = id;\r
     }\r

+\r
+    public void buildFinished(BuildEvent event) {\r
+        Throwable error = event.getException();\r
+        StringBuffer message = new StringBuffer();\r
+\r
+        if (error == null) {\r
+            message.append(StringUtils.LINE_SEP);\r
+            message.append("BUILD SUCCESSFUL");\r
+        } else {\r
+            message.append(StringUtils.LINE_SEP);\r
+            message.append("BUILD FAILED");\r
+            message.append(StringUtils.LINE_SEP);\r
+\r
+            if (Project.MSG_DEBUG <= msgOutputLevel\r
+                || !(error instanceof BuildException)) {\r
+                message.append(StringUtils.getStackTrace(error));\r
+            } else {\r
+                if (error instanceof BuildException) {\r
+                    message.append(error.toString()).append(lSep);\r
+                } else {\r
+                    message.append(error.getMessage()).append(lSep);\r
+                }\r
+            }\r
+        }\r
+        message.append(StringUtils.LINE_SEP);\r
+        message.append("Total time: ");\r
+        message.append(formatTime(System.currentTimeMillis() - startTime));\r
+\r
+        String msg = message.toString();\r
+        if (error == null) {\r
+            printMessage(msg, out, Project.MSG_VERBOSE);\r
+        } else {\r
+            printMessage(msg, err, Project.MSG_ERR);\r
+        }\r
+        log(msg);\r
+    }\r

 }
\ No newline at end of file
 }
\ 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 0140e8b704614bee058546f39c659935760ae256..1e95eb2b1a82b64dd6009297a665a01ee52255fa 100644 (file)
--- 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();\r
             guidPair[1] = entry.getGuidValue();\r
             guidDeclMap.put(entry.getCName(), guidPair);\r
             guidPair[0] = entry.getCName();\r
             guidPair[1] = entry.getGuidValue();\r
             guidDeclMap.put(entry.getCName(), guidPair);\r

-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[0]);\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[1]);\r

         }\r
         return guidDeclMap;\r
     }\r
         }\r
         return guidDeclMap;\r
     }\r


@@ -1859,9 +1856,6 @@ public class SurfaceAreaQuery {
             protocolPair[0] = entry.getCName();\r
             protocolPair[1] = entry.getGuidValue();\r
             protoclMap.put(entry.getCName(), protocolPair);\r
             protocolPair[0] = entry.getCName();\r
             protocolPair[1] = entry.getGuidValue();\r
             protoclMap.put(entry.getCName(), protocolPair);\r

-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[0]);\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[1]);\r

         }\r
         return protoclMap;\r
     }\r
         }\r
         return protoclMap;\r
     }\r