Return-Path: 
 <ant-dev-return-15621-apmail-jakarta-ant-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org
Received: (qmail 85644 invoked by uid 500); 12 Jul 2001 10:06:57 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ant-dev@jakarta.apache.org
list-help: <mailto:ant-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 85205 invoked by uid 500); 12 Jul 2001 10:06:51 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Date: 12 Jul 2001 10:06:45 -0000
Message-ID: <20010712100645.85139.qmail@apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: 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 <gthb@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;
       }
   }