conor 00/07/23 08:48:20
Modified: src/main/org/apache/tools/ant/taskdefs Javac.java
Log:
Remove the copying of support files by the Javac task. This feature has
been deprecated for some time, including the recent release.
Revision Changes Path
1.25 +2 -34
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Javac.java 2000/07/14 15:09:21 1.24
+++ Javac.java 2000/07/23 15:48:20 1.25
@@ -106,7 +106,6 @@
private Path extdirs;
protected Vector compileList = new Vector();
- protected Hashtable filecopyList = new Hashtable();
/**
* Create a nested <src ...> element for multiple source path
@@ -302,29 +301,6 @@
throw new BuildException(msg);
}
}
-
- // copy the support files
-
- if (filecopyList.size() > 0) {
- log("The implicit copying of support files by javac has been
deprecated. " +
- "Use the copydir task to copy support files explicitly.",
- Project.MSG_WARN);
-
- log("Copying " + filecopyList.size() +
- " support files to " + destDir.getAbsolutePath());
- Enumeration enum = filecopyList.keys();
- while (enum.hasMoreElements()) {
- String fromFile = (String) enum.nextElement();
- String toFile = (String) filecopyList.get(fromFile);
- try {
- project.copyFile(fromFile, toFile, filtering);
- } catch (IOException ioe) {
- String msg = "Failed to copy " + fromFile + " to " +
toFile
- + " due to " + ioe.getMessage();
- throw new BuildException(msg);
- }
- }
- }
}
/**
@@ -332,13 +308,11 @@
*/
protected void resetFileLists() {
compileList.removeAllElements();
- filecopyList.clear();
}
/**
- * Scans the directory looking for source files to be compiled and
- * support files to be copied. The results are returned in the
- * class variables compileList and filecopyList.
+ * Scans the directory looking for source files to be compiled.
+ * The results are returned in the class variable compileList
*/
protected void scanDir(File srcDir, File destDir, String files[]) {
@@ -358,12 +332,6 @@
if (srcFile.lastModified() > classFile.lastModified()) {
compileList.addElement(srcFile.getAbsolutePath());
- }
- } else {
- File destFile = new File(destDir, files[i]);
- if (srcFile.lastModified() > destFile.lastModified()) {
- filecopyList.put(srcFile.getAbsolutePath(),
- destFile.getAbsolutePath());
}
}
}
