\r
**/\r
package org.tianocore.framework.tasks;\r
+import java.io.File;\r
+\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Project;\r
import org.apache.tools.ant.Task;\r
/// input pre-processed dependency text files name\r
///\r
private String inputFile = "";\r
+ private String inputFileName = "";\r
///\r
/// padding integer value\r
///\r
//\r
// absolute path of edk tools\r
//\r
- String path = project.getProperty("env.Framework_Tools_Path");\r
+ String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
String command;\r
if (path == null) {\r
- command = "gendepex";\r
+ command = "GenDepex";\r
} else {\r
- command = path + "/" + "gendepex";\r
+ command = path + "/" + "GenDepex";\r
}\r
//\r
// argument of GenDepex tool\r
runner.setAntRun(project);\r
runner.setCommandline(commandLine.getCommandline());\r
\r
- System.out.println(Commandline.toString(commandLine\r
- .getCommandline()));\r
-\r
+ log(Commandline.toString(commandLine.getCommandline()), Project.MSG_VERBOSE);\r
+ log(inputFileName);\r
returnVal = runner.execute();\r
if (EFI_SUCCESS == returnVal) {\r
- //\r
- // command execution success\r
- //\r
- System.out.println("GenDepex execute succeeded!");\r
-\r
+ log("GenDepex succeeded!", Project.MSG_VERBOSE);\r
} else {\r
//\r
// command execution fail\r
//\r
- System.out.println("GenDepex failed. (error="\r
- + Integer.toHexString(returnVal) + ")");\r
- throw new BuildException("GenDepex failed. (error="\r
- + Integer.toHexString(returnVal) + ")");\r
+ log("ERROR = " + Integer.toHexString(returnVal));\r
+ throw new BuildException("GenDepex failed!");\r
}\r
} catch (Exception e) {\r
throw new BuildException(e.getMessage());\r
@param inputFileName name of inputFile\r
**/\r
public void setInputFile(String inputFileName) {\r
+ this.inputFileName = (new File(inputFileName)).getName();\r
this.inputFile = " -I " + inputFileName;\r
}\r
\r