**/\r
package org.tianocore.framework.tasks;\r
\r
-import org.apache.tools.ant.BuildException;\r
-import org.apache.tools.ant.Project;\r
-import org.apache.tools.ant.Task;\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.apache.tools.ant.types.Path;\r
-\r
import java.io.File;\r
import java.io.FileReader;\r
import java.io.FileWriter;\r
import java.io.IOException;\r
import java.io.LineNumberReader;\r
import java.util.ArrayList;\r
+import java.util.HashSet;\r
import java.util.Iterator;\r
import java.util.List;\r
+import java.util.Set;\r
import java.util.StringTokenizer;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
+\r
+import org.apache.tools.ant.BuildException;\r
+import org.apache.tools.ant.Project;\r
+import org.apache.tools.ant.Task;\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.apache.tools.ant.types.Path;\r
+\r
+import org.tianocore.common.logger.EdkLog;\r
\r
/**\r
Class MakeDeps is used to wrap MakeDeps.exe as an ANT task.\r
// private members, use set/get to access them\r
//\r
private static final String cmdName = "MakeDeps";\r
- private static final String target = "dummy";\r
private String includePath = null;\r
private String depsFile = null;\r
private String subDir = null;\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
\r
///\r
/// if there's no source files, we can do nothing about dependency\r
- /// \r
+ ///\r
if (inputFileList.size() == 0) {\r
throw new BuildException("No source files specified to scan");\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
- // change the old DEP file format (makefile compatible) to just file list\r
- if (!cleanup()) {\r
- throw new BuildException(depsFile + " was not generated");\r
- }\r
}\r
\r
///\r
String duplicateSeparator = separator + "{2}";\r
path = Path.translateFile(path);\r
path = path.replaceAll(duplicateSeparator, separator);\r
-\r
return path;\r
}\r
\r
inputFileList.add(inputFile);\r
}\r
\r
- /**\r
- The original file generated by MakeDeps.exe is for makefile uses. The target\r
- part (before :) is not useful for ANT. This method will do the removal.\r
-\r
- @returns true if cleaned files is saved successfully\r
- @returns false if error occurs in file I/O system\r
- **/\r
- private boolean cleanup() {\r
- File df = new File(depsFile);\r
-\r
- if (!df.exists()) {\r
- return false;\r
- }\r
-\r
- LineNumberReader lineReader = null;\r
- FileReader fileReader = null;\r
- try {\r
- fileReader = new FileReader(df);\r
- lineReader = new LineNumberReader(fileReader);\r
-\r
- ///\r
- /// clean-up each line in deps file\r
- //\r
- String line = null;\r
- StringBuffer cleanedLines = new StringBuffer(4096);\r
- while ((line = lineReader.readLine()) != null) {\r
- Pattern pattern = Pattern.compile(target + "[ ]*:[ ]*(.+)");\r
- Matcher matcher = pattern.matcher(line);\r
-\r
- while (matcher.find()) {\r
- ///\r
- /// keep the file name after ":"\r
- ///\r
- String filePath = line.substring(matcher.start(1), matcher.end(1));\r
- filePath = cleanupPathName(filePath);\r
- cleanedLines.append(filePath);\r
- cleanedLines.append("\n");\r
- }\r
- }\r
- lineReader.close();\r
- fileReader.close();\r
-\r
- ///\r
- /// we may have explicitly specified dependency files\r
- ///\r
- StringTokenizer fileTokens = new StringTokenizer(extraDeps, ";");\r
- while (fileTokens.hasMoreTokens()) {\r
- cleanedLines.append(cleanupPathName(fileTokens.nextToken()));\r
- cleanedLines.append("\n");\r
- }\r
-\r
- ///\r
- /// overwrite old dep file with new content\r
- ///\r
- FileWriter fileWriter = null;\r
- fileWriter = new FileWriter(df);\r
- fileWriter.write(cleanedLines.toString());\r
- fileWriter.close();\r
- } catch (IOException e) {\r
- log (e.getMessage());\r
- }\r
-\r
- return true;\r
- }\r
-\r
/**\r
Check if the dependency list file should be (re-)generated or not.\r
\r