X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkTasks%2Forg%2Ftianocore%2Fframework%2Ftasks%2FMakeDeps.java;h=5b76176a6455e5b09609909207dac07e8a2bd58d;hp=874e08ce2f8247aa7179c9983acbbc2bab3ddebd;hb=1fa1cb752a62f624ff8e7d81c89b89b56c44dc13;hpb=e485bb4bff9dbd617d73f2b93b840c4e2c54d6db diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java index 874e08ce2f..5b76176a64 100644 --- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java +++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java @@ -182,11 +182,6 @@ public class MakeDeps extends Task { EdkLog.log(EdkLog.EDK_INFO, "MakeDeps failed!"); return; } - - // change the old DEP file format (makefile compatible) to just file list - if (!cleanup()) { - throw new BuildException(depsFile + " was not generated!"); - } } /// @@ -326,75 +321,6 @@ public class MakeDeps extends Task { inputFileList.add(inputFile); } - /** - The original file generated by MakeDeps.exe is for makefile uses. The target - part (before :) is not useful for ANT. This method will do the removal. - - @returns true if cleaned files is saved successfully - @returns false if error occurs in file I/O system - **/ - private boolean cleanup() { - File df = new File(depsFile); - - if (!df.exists()) { - return false; - } - - LineNumberReader lineReader = null; - FileReader fileReader = null; - Set lineSet = new HashSet(100); // used to remove duplicated lines - try { - fileReader = new FileReader(df); - lineReader = new LineNumberReader(fileReader); - - /// - /// clean-up each line in deps file - // - String line = null; - while ((line = lineReader.readLine()) != null) { - String[] filePath = line.split(" : "); - if (filePath.length == 2) { - /// - /// keep the file name after ":" - /// - lineSet.add(cleanupPathName(filePath[1])); - } - } - lineReader.close(); - fileReader.close(); - - /// - /// we may have explicitly specified dependency files - /// - StringTokenizer fileTokens = new StringTokenizer(extraDeps, ";"); - while (fileTokens.hasMoreTokens()) { - lineSet.add(cleanupPathName(fileTokens.nextToken())); - } - - /// - /// compose the final file content - /// - StringBuffer cleanedLines = new StringBuffer(40960); - Iterator it = lineSet.iterator(); - while (it.hasNext()) { - String filePath = it.next(); - cleanedLines.append(filePath); - cleanedLines.append("\n"); - } - /// - /// overwrite old dep file with new content - /// - FileWriter fileWriter = null; - fileWriter = new FileWriter(df); - fileWriter.write(cleanedLines.toString()); - fileWriter.close(); - } catch (IOException e) { - log (e.getMessage()); - } - - return true; - } - /** Check if the dependency list file should be (re-)generated or not.