ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/script antRun
Date Fri, 09 Aug 2002 07:08:27 GMT
bodewig     2002/08/09 00:08:27

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Available.java
               src/script antRun
  Log:
  Make <available> less noisy.
  
  Merged from the 1.5 branch.
  
  Revision  Changes    Path
  1.281     +3 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.280
  retrieving revision 1.281
  diff -u -r1.280 -r1.281
  --- WHATSNEW	31 Jul 2002 07:04:48 -0000	1.280
  +++ WHATSNEW	9 Aug 2002 07:08:26 -0000	1.281
  @@ -44,6 +44,9 @@
   * Appendix E of Java Development with Ant (Loughran/Hatcher)
     contributed to the docs
   
  +* <available> will only print deprecration warnings if it is actually
  +  used to change the value of a property.
  +
   Changes from Ant 1.5beta3 to Ant 1.5
   ====================================
   
  
  
  
  1.50      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Available.java	25 Jul 2002 15:21:04 -0000	1.49
  +++ Available.java	9 Aug 2002 07:08:27 -0000	1.50
  @@ -245,7 +245,8 @@
           isTask = true;
           try {
               if (eval()) {
  -                if (null != getProject().getProperty(property)) {
  +                String oldvalue = getProject().getProperty(property);
  +                if (null != oldvalue && !oldvalue.equals(value)) {
                       log("DEPRECATED - <available> used to override an existing"
                           + " property."
                           + StringUtils.LINE_SEP
  
  
  
  1.4       +1 -1      jakarta-ant/src/script/antRun
  
  Index: antRun
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/antRun,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- antRun	8 Aug 2002 17:07:48 -0000	1.3
  +++ antRun	9 Aug 2002 07:08:27 -0000	1.4
  @@ -1,6 +1,6 @@
   #! /bin/sh
   
  -#   Copyright (c) 2001 The Apache Software Foundation.  All rights
  +#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
   #   reserved.
   
   # Args: DIR command
  
  
  

--
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