- Fixed EDKT146; The override warning message has been reduced to almost none.

[mirror_edk2.git] / Tools / Source / FrameworkTasks / org / tianocore / framework / tasks / MakeDeps.java

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 874e08ce2f8247aa7179c9983acbbc2bab3ddebd..5b76176a6455e5b09609909207dac07e8a2bd58d 100644 (file)
--- 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!");\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
@@ -326,75 +321,6 @@ public class MakeDeps extends Task {
         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
-        Set<String>         lineSet = new HashSet<String>(100); // used to remove duplicated lines\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
-            while ((line = lineReader.readLine()) != null) {\r
-                String[] filePath = line.split(" : ");\r
-                if (filePath.length == 2) {\r
-                    ///\r
-                    /// keep the file name after ":"\r
-                    ///\r
-                    lineSet.add(cleanupPathName(filePath[1]));\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
-                lineSet.add(cleanupPathName(fileTokens.nextToken()));\r
-            }\r
-\r
-            ///\r
-            /// compose the final file content\r
-            ///\r
-            StringBuffer cleanedLines = new StringBuffer(40960);\r
-            Iterator<String> it = lineSet.iterator();\r
-            while (it.hasNext()) {\r
-                String filePath = it.next();\r
-                cleanedLines.append(filePath);\r
-                cleanedLines.append("\n");\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