import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
import org.apache.tools.ant.types.Commandline;\r
import org.apache.tools.ant.types.Path;\r
+import org.tianocore.logger.EdkLog;\r
\r
/**\r
Class MakeDeps is used to wrap MakeDeps.exe as an ANT task.\r
\r
Project prj = this.getOwningTarget().getProject();\r
String toolPath = prj.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
+ FrameworkLogger logger = new FrameworkLogger(prj, "makedeps");\r
+ EdkLog.setLogLevel(prj.getProperty("env.LOGLEVEL"));\r
+ EdkLog.setLogger(logger);\r
+\r
///\r
/// compose full tool path\r
///\r
Iterator iterator = inputFileList.iterator();\r
while (iterator.hasNext()) {\r
Input inputFile = (Input)iterator.next();\r
+ String inputFileString = cleanupPathName(inputFile.getFile());\r
args.append(" -f ");\r
- args.append(cleanupPathName(inputFile.getFile()));\r
+ args.append(inputFileString);\r
}\r
\r
///\r
runner.setAntRun(prj);\r
runner.setCommandline(cmd.getCommandline());\r
\r
+ EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmd.getCommandline()));\r
+\r
int result = 0;\r
try {\r
result = runner.execute();\r
}\r
\r
if (result != 0) {\r
- log ("MakeDeps failed");\r
+ EdkLog.log(EdkLog.EDK_INFO, "MakeDeps failed!");\r
return;\r
}\r
\r
/// Remove any duplicated path separator or inconsistent path separator\r
///\r
private String cleanupPathName(String path) {\r
- try {\r
- path = (new File(path)).getCanonicalPath();\r
- } catch (IOException e) {\r
- String separator = "\\" + File.separator;\r
- String duplicateSeparator = separator + "{2}";\r
- path = Path.translateFile(path);\r
- path = path.replaceAll(duplicateSeparator, separator);\r
- return path;\r
- }\r
-\r
+ String separator = "\\" + File.separator;\r
+ String duplicateSeparator = separator + "{2}";\r
+ path = Path.translateFile(path);\r
+ path = path.replaceAll(duplicateSeparator, separator);\r
return path;\r
}\r
\r