Update log.

[mirror_edk2.git] / Tools / Source / FrameworkTasks / org / tianocore / framework / tasks / GenTeImageTask.java

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
index 347ae91e2547d625f37f294d6bf6919592845d25..9f0b743a471e5f5b62c22b5d567bcd069911c02c 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
@@ -2,14 +2,14 @@
  GenTeImageTask class.\r
 \r
  GenTeImageTask is used to call GenTEImage.exe to generate TE image .\r
- \r
- \r
+\r
+\r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  http://opensource.org/licenses/bsd-license.php\r
- \r
+\r
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
@@ -24,11 +24,12 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Execute;\r
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r
-import org.tianocore.logger.EdkLog;\r
+\r
+import org.tianocore.common.logger.EdkLog;\r
 \r
 /**\r
  * GenTeImageTask class.\r
- * \r
+ *\r
  * GenTeImageTask is used to call GenAcpiTable.exe to generate ACPI Table image .\r
  */\r
 public class GenTeImageTask extends Task implements EfiDefine {\r
@@ -63,27 +64,21 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * assemble tool command line & execute tool command line\r
-     * \r
+     *\r
      * @throws BuildException\r
      */\r
     /**\r
      * execute\r
-     * \r
+     *\r
      * GenTeImgaeTask execute function is to assemble tool command line & execute\r
      * tool command line\r
-     * \r
+     *\r
      * @throws BuidException\r
      */\r
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -125,8 +120,8 @@ public class GenTeImageTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_INFO, Commandline.toString(cmdline\r
-                    .getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -134,16 +129,13 @@ public class GenTeImageTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "GenTeImage succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenTeImage succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_ERROR, "GenTeImage failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-                throw new BuildException("GenTeImage failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+                throw new BuildException("GenTeImage failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
@@ -152,9 +144,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * getInputFile\r
-     * \r
+     *\r
      * This function is to get class member "inputFile".\r
-     * \r
+     *\r
      * @return string of input file name.\r
      */\r
     public String getInputFile() {\r
@@ -163,9 +155,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * setComponentType\r
-     * \r
+     *\r
      * This function is to set class member "inputFile".\r
-     * \r
+     *\r
      * @param inputFile\r
      *            string of input file name.\r
      */\r
@@ -175,9 +167,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * getOutputFile\r
-     * \r
+     *\r
      * This function is to get class member "outputFile"\r
-     * \r
+     *\r
      * @return outputFile string of output file name.\r
      */\r
     public String getOutputFile() {\r
@@ -186,9 +178,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * setOutputFile\r
-     * \r
+     *\r
      * This function is to set class member "outputFile"\r
-     * \r
+     *\r
      * @param outputFile\r
      *            string of output file name.\r
      */\r
@@ -198,9 +190,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * getOutputDir\r
-     * \r
+     *\r
      * This function is to get class member "outputDir"\r
-     * \r
+     *\r
      * @return outputDir string of output directory.\r
      */\r
     public String getOutputDir() {\r
@@ -209,9 +201,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * setOutputDir\r
-     * \r
+     *\r
      * This function is to set class member "outputDir"\r
-     * \r
+     *\r
      * @param outputDir\r
      *            string of output directory.\r
      */\r
@@ -221,9 +213,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * getVerbose\r
-     * \r
+     *\r
      * This function is to get class member "verbose"\r
-     * \r
+     *\r
      * @return verbose the flag of verbose.\r
      */\r
     public String getVerbose() {\r
@@ -232,9 +224,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * setVerbose\r
-     * \r
+     *\r
      * This function is to set class member "verbose"\r
-     * \r
+     *\r
      * @param verbose\r
      *            True or False.\r
      */\r
@@ -246,9 +238,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * getDump\r
-     * \r
+     *\r
      * This function is to get class member "dump"\r
-     * \r
+     *\r
      * @return verbose the flag of dump.\r
      */\r
     public String getDump() {\r
@@ -257,9 +249,9 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
     /**\r
      * setDump\r
-     * \r
+     *\r
      * This function is to set class member "dump"\r
-     * \r
+     *\r
      * @param dump\r
      *            True or False.\r
      */\r