Modify code according suggestion from code review meeting.

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
index ec74651cd0bee9af63baaa55974ebebf456d2b19..4e545e0012ec0ac658e887c5fcf5223fcd727ea7 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
@@ -2,14 +2,14 @@
  PeiReBaseTask class.\r
 \r
  PeiReBaseTask is used to call PeiReBase.exe to rebase efi fv 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
   PeiReBaseTask class.\r
@@ -50,23 +51,23 @@ public class PeiReBaseTask extends Task implements EfiDefine {
     // / Output directory, this variable is added by jave wrap\r
     // /\r
     private String outputDir = "";\r
-    \r
+\r
     ///\r
     /// Base address\r
     ///\r
     private String baseAddr = "";\r
-    \r
+\r
     ///\r
-    /// Architecture \r
+    /// Architecture\r
     ///\r
     private String arch = "";\r
-    \r
+\r
     /**\r
      * execute\r
-     * \r
+     *\r
      * PeiReBaseTask 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
@@ -78,7 +79,7 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
-        \r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -97,18 +98,19 @@ public class PeiReBaseTask extends Task implements EfiDefine {
         if (path != null) {\r
             command = path + File.separatorChar + command;\r
         }\r
-        \r
+\r
         //\r
         // argument of tools\r
         //\r
         File file = new File(outputFile);\r
         if (!file.isAbsolute() && (!this.outputDir.equalsIgnoreCase(""))) {\r
             argument = inputFile + " " +  "-O " + outputDir + File.separatorChar\r
-                    + outputFile + " " + this.baseAddr;\r
+                    + outputFile + " " + this.baseAddr + " "\r
+                    + "-M " + outputDir + + File.separatorChar + outputFile + ".map";\r
         } else {\r
-            argument = inputFile + " " + "-O " + outputFile + " " + this.baseAddr;\r
+            argument = inputFile + " " + "-O " + outputFile + " " + this.baseAddr+ " " + "-M " + outputFile + ".map";\r
         }\r
-        \r
+\r
         //\r
         // return value of fwimage execution\r
         //\r
@@ -130,9 +132,9 @@ public class PeiReBaseTask extends Task implements EfiDefine {
             //\r
             EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
             EdkLog.log(EdkLog.EDK_INFO, this.inputFileName);\r
-            \r
+\r
             revl = runner.execute();\r
-            \r
+\r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
@@ -152,9 +154,9 @@ public class PeiReBaseTask 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 +165,9 @@ public class PeiReBaseTask 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
@@ -176,9 +178,9 @@ public class PeiReBaseTask 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
@@ -187,9 +189,9 @@ public class PeiReBaseTask 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
@@ -199,9 +201,9 @@ public class PeiReBaseTask 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
@@ -210,9 +212,9 @@ public class PeiReBaseTask 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
@@ -222,9 +224,9 @@ public class PeiReBaseTask extends Task implements EfiDefine {
 \r
     /**\r
      * getBaseAddr\r
-     * \r
+     *\r
      * This function is to get class member "baseAddr"\r
-     * \r
+     *\r
      * @return baseAddr   string of base address.\r
      */\r
     public String getBaseAddr() {\r
@@ -233,9 +235,9 @@ public class PeiReBaseTask extends Task implements EfiDefine {
 \r
     /**\r
      * setBaseAddr\r
-     * \r
+     *\r
      * This function is to set class member "baseAddr"\r
-     * \r
+     *\r
      * @param baseAddr    string of base address\r
      */\r
     public void setBaseAddr(String baseAddr) {\r
@@ -244,9 +246,9 @@ public class PeiReBaseTask extends Task implements EfiDefine {
 \r
     /**\r
      * getArch\r
-     * \r
+     *\r
      * This function is to get class member "arch".\r
-     * \r
+     *\r
      * @return arch       Architecture\r
      */\r
     public String getArch() {\r
@@ -255,9 +257,9 @@ public class PeiReBaseTask extends Task implements EfiDefine {
 \r
     /**\r
      * setArch\r
-     * \r
-     * This function is to set class member "arch" \r
-     * \r
+     *\r
+     * This function is to set class member "arch"\r
+     *\r
      * @param arch         Architecture\r
      */\r
     public void setArch(String arch) {\r