**/\r
package org.tianocore.framework.tasks;\r
\r
-import java.io.ByteArrayOutputStream;\r
import java.io.DataInputStream;\r
import java.io.DataOutputStream;\r
import java.io.File;\r
import java.util.ArrayList;\r
import java.util.Iterator;\r
import java.util.List;\r
+import java.util.Random;\r
\r
import org.apache.tools.ant.BuildException;\r
import org.tianocore.common.logger.EdkLog;\r
private String toolName = "";\r
private ToolArg toolArgList = new ToolArg();\r
private Input inputFiles = new Input();\r
+ private Input tempInputFile = new Input();\r
private String outputPath;\r
- private File outputFile ;\r
+ private String outputFileName ;\r
private List<Section> gensectList = new ArrayList<Section>();\r
/**\r
Call extern tool\r
try {\r
executeTool ();\r
} catch (Exception e) {\r
- throw new BuildException("Call to executeTool failed!\n");\r
+ throw new BuildException("Call to executeTool failed!\n" + e.getMessage());\r
}\r
\r
///\r
/// check if file exist\r
///\r
- //File OutputFile = new File (this.outPutFileName);\r
+ File outputFile = new File (this.outputFileName);\r
if (!outputFile.exists()) {\r
throw new BuildException("The file " + outputFile.getPath() + " does not exist!\n");\r
}\r
buffer.writeByte(0);\r
}\r
} catch (Exception e) {\r
- System.out.print(e.getMessage());\r
+ EdkLog.log(e.getMessage());\r
throw new BuildException("Tool call, toBuffer failed!\n");\r
} finally {\r
try {\r
if (fs != null) {\r
fs.close();\r
}\r
+ outputFile.delete(); \r
} catch (Exception e) {\r
- System.out.println("WARNING: Cannot close " + outputFile.getPath());\r
+ EdkLog.log("WARNING: Cannot close " + outputFile.getPath());\r
}\r
}\r
}\r
sect.toBuffer(Do);\r
}\r
catch (BuildException e) {\r
- System.out.print(e.getMessage());\r
+ EdkLog.log(e.getMessage());\r
throw new BuildException ("GenSection failed at Tool!");\r
- } \r
- Do.close();\r
- this.inputFiles.insFile(outputFile.getPath()); \r
+ } finally {\r
+ if (Do != null){\r
+ Do.close(); \r
+ }\r
+ \r
+ } \r
+ this.tempInputFile.insFile(outputFile.getPath());\r
} \r
} catch (IOException e){\r
throw new BuildException ("Gensection failed at tool!");\r
- }\r
+ } \r
\r
try {\r
- outputFile = File.createTempFile("temp", null, new File(outputPath));\r
+ Random ran = new Random(9999); \r
+ this.outputFileName = "Temp" + ran.nextInt();\r
argument = toolArgList + inputFiles.toStringWithSinglepPrefix(" -i ") \r
- + " -o " + outputFile.getPath();\r
+ + tempInputFile.toString(" ")+ " -o " + outputFileName;\r
EdkLog.log(this, EdkLog.EDK_VERBOSE, command + " " + argument);\r
+ EdkLog.log(this, EdkLog.EDK_INFO, this.outputFileName);\r
///\r
/// execute command line\r
///\r
Process process = Runtime.getRuntime().exec(command + " " + argument);\r
process.waitFor();\r
- } catch (Exception e) {\r
- System.out.print (e.getMessage());\r
+ Iterator tempFile = tempInputFile.getNameList().iterator();\r
+ while (tempFile.hasNext()){\r
+ File file = new File((String)tempFile.next());\r
+ if (file.exists()) {\r
+ file.delete();\r
+ }\r
+ }\r
+ } catch (Exception e) {\r EdkLog.log(e.getMessage());\r
throw new BuildException("Execution of externalTool task failed!\n");\r
}\r
}\r