ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/helper ProjectHelper2.java
Date Sun, 05 Jan 2003 13:16:42 GMT
conor       2003/01/05 05:16:42

  Modified:    src/main/org/apache/tools/ant/helper ProjectHelper2.java
  Log:
  Can't compare files with strings
  
  Revision  Changes    Path
  1.9       +96 -93    jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
  
  Index: ProjectHelper2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- ProjectHelper2.java	31 Dec 2002 22:07:07 -0000	1.8
  +++ ProjectHelper2.java	5 Jan 2003 13:16:42 -0000	1.9
  @@ -627,12 +627,15 @@
               // XXX Move to Project ( so it is shared by all helpers )
               String antFileProp="ant.file." + context.currentProjectName;
               String dup=project.getProperty(antFileProp);
  -            if( dup!=null && ! dup.equals(context.buildFile)) {
  +            if (dup != null) {
  +                File dupFile = new File(dup);
  +                if (!dupFile.equals(context.buildFile)) {
                   project.log("Duplicated project name in import. Project "+
                           context.currentProjectName + " defined first in " +
                           dup + " and again in " + context.buildFile,
                           Project.MSG_WARN);
               }
  +            }
   
               if( context.buildFile != null ) {
                   project.setUserProperty("ant.file."+context.currentProjectName,
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message