bodewig 2004/02/27 06:57:32
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecuteOn.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.503.2.49 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.48
retrieving revision 1.503.2.49
diff -u -r1.503.2.48 -r1.503.2.49
--- WHATSNEW 27 Feb 2004 11:54:53 -0000 1.503.2.48
+++ WHATSNEW 27 Feb 2004 14:57:32 -0000 1.503.2.49
@@ -22,6 +22,9 @@
* Throw build exception if target repeated in build file, but allow targets
to be repeated in imported files.
+* <apply> didn't compare timestamps of source and targetfiles when
+ using a nested <filelist>. Bugzilla Report 26985.
+
Other changes:
--------------
No revision
No revision
1.46.2.4 +18 -1 ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -u -r1.46.2.3 -r1.46.2.4
--- ExecuteOn.java 9 Feb 2004 22:12:18 -0000 1.46.2.3
+++ ExecuteOn.java 27 Feb 2004 14:57:32 -0000 1.46.2.4
@@ -312,7 +312,7 @@
for (int i = 0; i < filelists.size(); i++) {
FileList list = (FileList) filelists.elementAt(i);
File base = list.getDir(getProject());
- String[] names = list.getFiles(getProject());
+ String[] names = getFilesAndDirs(list);
for (int j = 0; j < names.length; j++) {
File f = new File(base, names[j]);
@@ -533,6 +533,23 @@
mapper);
} else {
return ds.getIncludedDirectories();
+ }
+ }
+
+ /**
+ * Return the list of files or directories from this FileList that
+ * should be included on the command line.
+ *
+ * @since Ant 1.6.2
+ */
+ protected String[] getFilesAndDirs(FileList list) {
+ if (mapper != null) {
+ SourceFileScanner sfs = new SourceFileScanner(this);
+ return sfs.restrict(list.getFiles(getProject()),
+ list.getDir(getProject()), destDir,
+ mapper);
+ } else {
+ return list.getFiles(getProject());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
