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
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
- ///\r
- /// tool name\r
- ///\r
+ //\r
+ // tool name\r
+ //\r
private String toolName = "GenTeImage";\r
- ///\r
- /// input file\r
- ///\r
- private String inputFile = "";\r
-\r
- ///\r
- /// output file\r
- ///\r
- private String outputFile = "";\r
-\r
- ///\r
- /// output directory, this variable is added by jave wrap\r
- ///\r
+ //\r
+ // input file\r
+ //\r
+ private FileArg inputFile = new FileArg();\r
+\r
+ //\r
+ // output file\r
+ //\r
+ private FileArg outputFile = new FileArg();\r
+\r
+ //\r
+ // output directory, this variable is added by jave wrap\r
+ //\r
private String outputDir = "";\r
\r
- ///\r
- /// Verbose flag\r
- ///\r
- private String verbose = "";\r
+ //\r
+ // Verbose flag\r
+ //\r
+ private ToolArg verbose = new ToolArg();\r
\r
- ///\r
- /// Dump flag\r
- ///\r
- private String dump = "";\r
+ //\r
+ // Dump flag\r
+ //\r
+ private ToolArg dump = new ToolArg();\r
\r
/**\r
- * assemble tool command line & execute tool command line\r
- * \r
- * @throws BuildException\r
- */\r
- /**\r
- * execute\r
- * \r
- * GenTeImgaeTask execute function is to assemble tool command line & execute\r
- * tool command line\r
- * \r
- * @throws BuidException\r
- */\r
+ execute\r
+ \r
+ GenTeImgaeTask execute function is to assemble tool command line & execute\r
+ tool command line\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
if (path == null) {\r
command = toolName;\r
} else {\r
- command = path + File.separatorChar + toolName;\r
+ command = path + File.separator + toolName;\r
}\r
//\r
// argument of tools\r
//\r
- File file = new File(outputFile);\r
- if (!file.isAbsolute() && (!this.outputDir.equalsIgnoreCase(""))) {\r
- argument = this.verbose + this.dump + "-o " +this.outputDir\r
- + File.separatorChar + this.outputFile + " "\r
- + this.inputFile;\r
- } else {\r
- argument = this.verbose + this.dump + "-o " + this.outputFile\r
- + " " + this.inputFile;\r
- }\r
+ argument = "" + this.verbose + this.dump + this.outputFile + this.inputFile;\r
//\r
// return value of fwimage execution\r
//\r
\r
runner.setAntRun(project);\r
runner.setCommandline(cmdline.getCommandline());\r
+ runner.setWorkingDirectory(new File(outputDir));\r
+\r
//\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, this.inputFile.toFileList()\r
+ + " => " + this.outputFile.toFileList());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "GenTeImage succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, toolName + " 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(toolName + " failed!");\r
}\r
} catch (Exception e) {\r
throw new BuildException(e.getMessage());\r
}\r
\r
/**\r
- * getInputFile\r
- * \r
- * This function is to get class member "inputFile".\r
- * \r
- * @return string of input file name.\r
- */\r
+ getInputFile\r
+ \r
+ This function is to get class member "inputFile".\r
+ \r
+ @return string of input file name.\r
+ **/\r
public String getInputFile() {\r
- return inputFile;\r
+ return inputFile.getValue();\r
}\r
\r
/**\r
- * setComponentType\r
- * \r
- * This function is to set class member "inputFile".\r
- * \r
- * @param inputFile\r
- * string of input file name.\r
- */\r
+ setComponentType\r
+ \r
+ This function is to set class member "inputFile".\r
+ \r
+ @param inputFile\r
+ string of input file name.\r
+ **/\r
public void setInputFile(String inputFile) {\r
- this.inputFile = inputFile;\r
+ this.inputFile.setArg(" ", inputFile);\r
}\r
\r
/**\r
- * getOutputFile\r
- * \r
- * This function is to get class member "outputFile"\r
- * \r
- * @return outputFile string of output file name.\r
- */\r
+ getOutputFile\r
+ \r
+ This function is to get class member "outputFile"\r
+ \r
+ @return outputFile string of output file name.\r
+ **/\r
public String getOutputFile() {\r
- return outputFile;\r
+ return outputFile.getValue();\r
}\r
\r
/**\r
- * setOutputFile\r
- * \r
- * This function is to set class member "outputFile"\r
- * \r
- * @param outputFile\r
- * string of output file name.\r
- */\r
+ setOutputFile\r
+ \r
+ This function is to set class member "outputFile"\r
+ \r
+ @param outputFile\r
+ string of output file name.\r
+ **/\r
public void setOutputFile(String outputFile) {\r
- this.outputFile = outputFile + " ";\r
+ this.outputFile.setArg(" -o ", outputFile);\r
}\r
\r
/**\r
- * getOutputDir\r
- * \r
- * This function is to get class member "outputDir"\r
- * \r
- * @return outputDir string of output directory.\r
- */\r
+ getOutputDir\r
+ \r
+ This function is to get class member "outputDir"\r
+ \r
+ @return outputDir string of output directory.\r
+ **/\r
public String getOutputDir() {\r
return outputDir;\r
}\r
\r
/**\r
- * setOutputDir\r
- * \r
- * This function is to set class member "outputDir"\r
- * \r
- * @param outputDir\r
- * string of output directory.\r
- */\r
+ setOutputDir\r
+ \r
+ This function is to set class member "outputDir"\r
+ \r
+ @param outputDir\r
+ string of output directory.\r
+ **/\r
public void setOutputDir(String outputDir) {\r
this.outputDir = outputDir;\r
}\r
\r
/**\r
- * getVerbose\r
- * \r
- * This function is to get class member "verbose"\r
- * \r
- * @return verbose the flag of verbose.\r
- */\r
+ getVerbose\r
+ \r
+ This function is to get class member "verbose"\r
+ \r
+ @return verbose the flag of verbose.\r
+ **/\r
public String getVerbose() {\r
- return this.verbose;\r
+ return this.verbose.getValue();\r
}\r
\r
/**\r
- * setVerbose\r
- * \r
- * This function is to set class member "verbose"\r
- * \r
- * @param verbose\r
- * True or False.\r
- */\r
+ setVerbose\r
+ \r
+ This function is to set class member "verbose"\r
+ \r
+ @param verbose\r
+ True or False.\r
+ **/\r
public void setVerbose(boolean verbose) {\r
if (verbose) {\r
- this.verbose = "-v ";\r
+ this.verbose.setArg(" -", "v");\r
}\r
}\r
\r
/**\r
- * getDump\r
- * \r
- * This function is to get class member "dump"\r
- * \r
- * @return verbose the flag of dump.\r
- */\r
+ getDump\r
+ \r
+ This function is to get class member "dump"\r
+ \r
+ @return verbose the flag of dump.\r
+ **/\r
public String getDump() {\r
- return dump;\r
+ return dump.getValue();\r
}\r
\r
/**\r
- * setDump\r
- * \r
- * This function is to set class member "dump"\r
- * \r
- * @param dump\r
- * True or False.\r
- */\r
+ setDump\r
+ \r
+ This function is to set class member "dump"\r
+ \r
+ @param dump\r
+ True or False.\r
+ **/\r
public void setDump(boolean dump) {\r
if (dump) {\r
- this.dump = "-dump ";\r
+ this.dump.setArg(" -", "dump");\r
}\r
}\r
}\r
projects / mirror_edk2.git / blobdiff