ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant CONTRIBUTORS WHATSNEW TODO
Date Fri, 11 Jun 2004 16:38:56 GMT
mbenson     2004/06/11 09:38:56

  Modified:    src/main/org/apache/tools/ant Tag: ANT_16_BRANCH Target.java
               .        Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW TODO
  Log:
  Merge Target.getIf/Unless() + Target Location from HEAD
  PR: 28599, 29320
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.46.2.7  +40 -0     ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.46.2.6
  retrieving revision 1.46.2.7
  diff -u -r1.46.2.6 -r1.46.2.7
  --- Target.java	10 Jun 2004 08:15:49 -0000	1.46.2.6
  +++ Target.java	11 Jun 2004 16:38:56 -0000	1.46.2.7
  @@ -42,6 +42,8 @@
       private List dependencies = null;
       /** Children of this target (tasks and data types). */
       private List children = new ArrayList();
  +    /** Since Ant 1.6.2 */
  +    private Location location = Location.UNKNOWN_LOCATION;
   
       /** Project this target belongs to. */
       private Project project;
  @@ -74,6 +76,24 @@
       }
   
       /**
  +     * Sets the location of this target's definition.
  +     *
  +     * @param location   <CODE>Location</CODE>
  +     */
  +    public void setLocation(Location location) {
  +        this.location = location;
  +    }
  +
  +    /**
  +     * Get the location of this target's definition.
  +     *
  +     * @return <CODE>Location</CODE>
  +     */
  +    public Location getLocation() {
  +        return location;
  +    }
  +
  +    /**
        * Sets the list of targets this target is dependent on.
        * The targets themselves are not resolved at this time.
        *
  @@ -227,6 +247,16 @@
       }
   
       /**
  +     * Returns the "if" property condition of this target.
  +     *
  +     * @return the "if" property condition or <code>null</code> if no
  +     *         "if" condition had been defined.
  +     */
  +    public String getIf() {
  +        return ("".equals(ifCondition) ? null : ifCondition);
  +    }
  +
  +    /**
        * Sets the "unless" condition to test on execution. This is the
        * name of a property to test for existence - if the property
        * is set, the task will not execute. The property goes
  @@ -241,6 +271,16 @@
        */
       public void setUnless(String property) {
           this.unlessCondition = (property == null) ? "" : property;
  +    }
  +
  +    /**
  +     * Returns the "unless" property condition of this target.
  +     *
  +     * @return the "unless" property condition or <code>null</code>
  +     *         if no "unless" condition had been defined.
  +     */
  +    public String getUnless() {
  +        return ("".equals(unlessCondition) ? null : unlessCondition);
       }
   
       /**
  
  
  
  No                   revision
  No                   revision
  1.1.2.15  +2 -1      ant/CONTRIBUTORS
  
  Index: CONTRIBUTORS
  ===================================================================
  RCS file: /home/cvs/ant/CONTRIBUTORS,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- CONTRIBUTORS	4 Jun 2004 07:47:59 -0000	1.1.2.14
  +++ CONTRIBUTORS	11 Jun 2004 16:38:56 -0000	1.1.2.15
  @@ -20,9 +20,10 @@
   Charles Hudak
   Charlie Hubbard
   Chris Povirk
  +Christoph Wilhelms
  +Christophe Labouisse
   Christopher A. Longo
   Christopher Charlier
  -Christoph Wilhelms
   Conor MacNeill
   Costin Manolache
   Craeg Strong
  
  
  
  1.503.2.103 +5 -4      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.102
  retrieving revision 1.503.2.103
  diff -u -r1.503.2.102 -r1.503.2.103
  --- WHATSNEW	10 Jun 2004 09:12:46 -0000	1.503.2.102
  +++ WHATSNEW	11 Jun 2004 16:38:56 -0000	1.503.2.103
  @@ -97,8 +97,7 @@
   
   * JDependTask did not close an output file. Bugzilla Report 28557.
   
  -* Using <macrodef> could break XmlLogger. Bugzilla Report 28993
  -.
  +* Using <macrodef> could break XmlLogger. Bugzilla Report 28993.
   
   * <genkey> no longer requires keytool to be in your PATH.  Bugzilla
     Report 29382.
  @@ -148,8 +147,6 @@
   
   * New attribute "negate" on <propertyset> to invert selection criteria.
   
  -* Target now supports a Location member.  Bugzilla Report 28599.
  -
   * New "pattern" attribute for <date> selector.
   
   * <junit> has a new forkmode attribute that controls the number of
  @@ -185,6 +182,10 @@
   * Add implicit nested element to <macrodef>. Bugzilla Report 25633.
   
   * Add deleteonexit attribute to <delete>.
  +
  +* Target now supports a Location member.  Bugzilla Report 28599.
  +
  +* Added Target.getIf/Unless().  Bugzilla Report 29320.
   
   Changes from Ant 1.6.0 to Ant 1.6.1
   =============================================
  
  
  
  1.3.2.13  +0 -4      ant/Attic/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/ant/Attic/TODO,v
  retrieving revision 1.3.2.12
  retrieving revision 1.3.2.13
  diff -u -r1.3.2.12 -r1.3.2.13
  --- TODO	11 Jun 2004 14:20:14 -0000	1.3.2.12
  +++ TODO	11 Jun 2004 16:38:56 -0000	1.3.2.13
  @@ -15,8 +15,6 @@
   
   * merge cygwin changes for ant script from HEAD [Matt]
   
  -* merge Target.set/getLocation() from HEAD [Matt]
  -
   * merge "<apply> differentiates between empty & up-to-date" from HEAD [Matt]
   
   * Fix or at least document support for tomcat 5.0 jsp
  @@ -32,8 +30,6 @@
   
   * telnet doesn't disconnect properly (PR 25935) [Stefan unless Peter
     is faster].
  -
  -* merge Target.getIf/Unless() from HEAD [Matt]
   
   * Xml NS on nested elements resolution [Start thread, Peter]
   
  
  
  

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


Mime
View raw message