Remove FrameworkLogger in FrameworkTasks and EdkException in GenBuild. Update EdkLog...

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
index 0ee1c10b9423b58b7148899f0b37c5eb72d75556..0f82002bb503a9bbbc9cec73bdfbe9be172b2241 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
@@ -2,14 +2,14 @@
  EfiCompressTask class.\r
 \r
  EfiCompressTask is used to call EfiCompress.exe to strip input file.\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,7 +24,8 @@ 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
   EfiCompressTask class.\r
@@ -49,21 +50,16 @@ public class EfiCompressTask extends Task implements EfiDefine {
 \r
     /**\r
      * execute\r
-     * \r
+     *\r
      * EfiCompressTask 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, "eficompress");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -104,23 +100,22 @@ public class EfiCompressTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_INFO, Commandline.toString(cmdline.getCommandline()));\r
-            \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
+\r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO,"EfiCompress succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "EfiCompress succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_ERROR, "EfiCompress failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-                throw new BuildException("Strip failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                throw new BuildException("EfiCompress failed!");\r
 \r
             }\r
         } catch (Exception e) {\r
@@ -130,9 +125,9 @@ public class EfiCompressTask 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
@@ -141,9 +136,9 @@ public class EfiCompressTask 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
@@ -153,9 +148,9 @@ public class EfiCompressTask 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
@@ -164,9 +159,9 @@ public class EfiCompressTask 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
@@ -176,9 +171,9 @@ public class EfiCompressTask 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
@@ -187,9 +182,9 @@ public class EfiCompressTask 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