You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/07/12 12:06:45 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs UpToDate.java
bodewig 01/07/12 03:06:44
Modified: src/main/org/apache/tools/ant/taskdefs UpToDate.java
Log:
make <uptodate> search for target files in the same directory as
source files
Submitted by: Gunnlaugur Thor Briem <gt...@dimon.is>
Revision Changes Path
1.6 +3 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpToDate.java 2001/03/29 10:13:07 1.5
+++ UpToDate.java 2001/07/12 10:06:40 1.6
@@ -177,13 +177,15 @@
protected boolean scanDir(File srcDir, String files[]) {
SourceFileScanner sfs = new SourceFileScanner(this);
FileNameMapper mapper = null;
+ File dir = srcDir;
if (mapperElement == null) {
MergingMapper mm = new MergingMapper();
mm.setTo(_targetFile.getAbsolutePath());
mapper = mm;
+ dir = null;
} else {
mapper = mapperElement.getImplementation();
}
- return sfs.restrict(files, srcDir, null, mapper).length == 0;
+ return sfs.restrict(files, srcDir, dir, mapper).length == 0;
}
}