conor 00/11/19 22:25:21
Modified: src/main/org/apache/tools/ant/taskdefs Javac.java
Log:
Fix up problem with multiple source dirs in javac
Revision Changes Path
1.58 +8 -1
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Javac.java 2000/11/16 17:05:34 1.57
+++ Javac.java 2000/11/20 06:25:20 1.58
@@ -362,7 +362,14 @@
m.setFrom("*.java");
m.setTo("*.class");
SourceFileScanner sfs = new SourceFileScanner(this);
- compileList = sfs.restrictAsFiles(files, srcDir, destDir, m);
+ File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDir, m);
+
+ if (newFiles.length > 0) {
+ File[] newCompileList = new File[compileList.length +
newFiles.length];
+ System.arraycopy(compileList, 0, newCompileList, 0,
compileList.length);
+ System.arraycopy(newFiles, 0, newCompileList,
compileList.length, newFiles.length);
+ compileList = newCompileList;
+ }
}
// XXX
