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

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
index 156d7e309ae620dd2bb4b958c767e0bceb4a2d46..d9eafacc37f40981e33c5b252d45eb5f1880ef04 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
@@ -2,14 +2,14 @@
  GenAcpiTable class.\r
 \r
  GenAcpiTable is used to call GenAcpiTable.exe to generate ACPI Table 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,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
   GenAcpiTable class.\r
@@ -49,22 +50,16 @@ public class GenAcpiTableTask extends Task implements EfiDefine {
 \r
     /**\r
      * execute\r
-     * \r
+     *\r
      * StripTask 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, "genacpitable");\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
@@ -104,24 +99,21 @@ public class GenAcpiTableTask 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
             revl = runner.execute();\r
-            \r
+\r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO,"GenAcpiTable successed!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenAcpiTable succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_ERROR, "GenAcpiTable failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-                throw new BuildException("GenAcpiTable failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                throw new BuildException("GenAcpiTable failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
@@ -130,9 +122,9 @@ public class GenAcpiTableTask 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 +133,9 @@ public class GenAcpiTableTask 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 +145,9 @@ public class GenAcpiTableTask 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 +156,9 @@ public class GenAcpiTableTask 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 +168,9 @@ public class GenAcpiTableTask 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 +179,9 @@ public class GenAcpiTableTask 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