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/main/org/apache/tools/ant Target.java
Date Mon, 22 Jul 2002 11:12:16 GMT
bodewig     2002/07/22 04:12:16

  Modified:    docs/manual install.html
               docs/manual/CoreTasks copy.html move.html
               src/main/org/apache/tools/ant Target.java
  Log:
  Merge changes from 1.5 branch to HEAD.
  
  Revision  Changes    Path
  1.33      +3 -7      jakarta-ant/docs/manual/install.html
  
  Index: install.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/install.html,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- install.html	9 Jul 2002 21:05:50 -0000	1.32
  +++ install.html	22 Jul 2002 11:12:16 -0000	1.33
  @@ -17,8 +17,8 @@
   <h3>Source Edition</h3>
   
   <p>If you prefer the source edition, you can download the source for the latest Ant
release from <a
  -href="http://jakarta.apache.org/builds/ant/release/v1.4.1/src/">
  -http://jakarta.apache.org/builds/ant/release/v1.4.1/src/</a>. 
  +href="http://jakarta.apache.org/builds/ant/release/v1.5/src/">
  +http://jakarta.apache.org/builds/ant/release/v1.5/src/</a>.
   
   Again, if you prefer the edge, you can access 
   the code as it is being developed via CVS. The Jakarta website has details on 
  @@ -133,11 +133,7 @@
   <h3><a name="optionalTasks">Optional Tasks</a></h3>
   <p>Ant supports a number of optional tasks. An optional task is a task which
   typically requires an external library to function. The optional tasks are 
  -packaged separately from the core Ant tasks. This package is available in 
  -the same download directory as the core ant distribution. The current 
  -jar containing optional tasks is named <code>jakarta-ant-1.4.1-optional.jar</code>.
  -This jar should be downloaded and placed in the lib directory of your Ant 
  -installation.</p> 
  +packaged together with the core Ant tasks.</p>
   
   <p>The external libraries required by each of the optional tasks is detailed
   in the <a href="#librarydependencies">Library Dependencies</a> section. These
external
  
  
  
  1.12      +6 -0      jakarta-ant/docs/manual/CoreTasks/copy.html
  
  Index: copy.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/copy.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- copy.html	1 Jun 2002 12:26:33 -0000	1.11
  +++ copy.html	22 Jul 2002 11:12:16 -0000	1.12
  @@ -117,6 +117,12 @@
   <p>The Copy task supports nested <a href="../CoreTypes/filterchain.html">
   FilterChain</a>s.</p>
   
  +<p>
  +If &lt;filterset&gt; and &lt;filterchain&gt; elements are used inside the
  +same &lt;copy&gt; task, all &lt;filterchain&gt; elements are processed
first
  +followed by &lt;filterset&gt; elements.
  +</p>
  +
   <h3>Examples</h3>
   <p><b>Copy a single file</b></p>
   <pre>
  
  
  
  1.8       +7 -0      jakarta-ant/docs/manual/CoreTasks/move.html
  
  Index: move.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/move.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- move.html	1 Jun 2002 12:26:33 -0000	1.7
  +++ move.html	22 Jul 2002 11:12:16 -0000	1.8
  @@ -79,6 +79,13 @@
   <h4>filterchain</h4>
   <p>The Move task supports nested <a href="../CoreTypes/filterchain.html">
   FilterChain</a>s.</p>
  +
  +<p>
  +If &lt;filterset&gt; and &lt;filterchain&gt; elements are used inside the
  +same &lt;move&gt; task, all &lt;filterchain&gt; elements are processed
first
  +followed by &lt;filterset&gt; elements.
  +</p>
  +
   <h3>Examples</h3>
   <p><b>Move a single file (rename a file)</b></p>
   <pre>
  
  
  
  1.34      +5 -3      jakarta-ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Target.java	9 Apr 2002 15:27:07 -0000	1.33
  +++ Target.java	22 Jul 2002 11:12:16 -0000	1.34
  @@ -313,11 +313,13 @@
                   }
               }
           } else if (!testIfCondition()) {
  -            project.log(this, "Skipped because property '" + this.ifCondition 
  -                + "' not set.", Project.MSG_VERBOSE);
  +            project.log(this, "Skipped because property '" 
  +                        + project.replaceProperties(this.ifCondition) 
  +                        + "' not set.", Project.MSG_VERBOSE);
           } else {
               project.log(this, "Skipped because property '" 
  -                + this.unlessCondition + "' set.", Project.MSG_VERBOSE);
  +                        + project.replaceProperties(this.unlessCondition) 
  +                        + "' set.", Project.MSG_VERBOSE);
           }
       }
   
  
  
  

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