conor 2003/02/09 04:17:16
Modified: . WHATSNEW
docs/manual/CoreTasks exec.html java.html
Log:
Document new input capabilities
Revision Changes Path
1.356 +10 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -w -u -r1.355 -r1.356
--- WHATSNEW 6 Feb 2003 12:53:48 -0000 1.355
+++ WHATSNEW 9 Feb 2003 12:17:16 -0000 1.356
@@ -210,6 +210,16 @@
* <replaceregexp> now has an optional encoding attribute to support
replacing in files that are in a different encoding than the
platform's default.
+
+* The <exec> task may now have its input redirected from either a file or
+ a string from the build file. The error output can be separated to a
different
+ file when outut is redirected. standard error may be logged to the Ant log
+ when redirecting output to a file
+
+* The <java> task also supports the input redirection and separate error
streams
+ introduced to the <exec> task. In addition, it is now possible to save the
+ output into a property for use within the build file as was possible with
<exec>
+ in Ant 1.5
Changes from Ant 1.5.1Beta1 to 1.5.1
====================================
1.24 +20 -7 jakarta-ant/docs/manual/CoreTasks/exec.html
Index: exec.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/exec.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -u -r1.23 -r1.24
--- exec.html 6 Feb 2003 13:10:21 -0000 1.23
+++ exec.html 9 Feb 2003 12:17:16 -0000 1.24
@@ -53,14 +53,13 @@
</tr>
<tr>
<td valign="top">output</td>
- <td valign="top">the file to which the output of the command should be
- redirected. If the error stream is not also redirected to a file
- or poerperty, it will appear in the output</td>
+ <td valign="top">Name of a file to which to write the output. If the
error stream
+ is not also redirected to a file or property, it will appear in this
output.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">error</td>
- <td valign="top">the file to which the standard error of the command
should be
+ <td valign="top">The file to which the standard error of the command
should be
redirected. </td>
<td align="center" valign="top">No</td>
</tr>
@@ -75,21 +74,35 @@
</tr>
<tr>
<td valign="top">append</td>
- <td valign="top">whether output and error files should be appended to or
overwritten.
+ <td valign="top">Whether output and error files should be appended to or
overwritten.
Defaults to false.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">outputproperty</td>
- <td valign="top">the name of a property in which the output of the
+ <td valign="top">The name of a property in which the output of the
command should be stored. Unless the error stream is redirected to a
separate
file or stream, this property will include the error output.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">errorproperty</td>
- <td valign="top">the name of a property in which the standard error of
the
+ <td valign="top">The name of a property in which the standard error of
the
command should be stored.</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">input</td>
+ <td valign="top">A file from which the executed command's standard input
+ is taken. This attribute is mutually exclusive with the
+ inputstring attribute</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">inputstring</td>
+ <td valign="top">A string which serves as the input stream for the
+ executed command. This attribute is mutually exclusive
with the
+ inputstring attribute.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
1.15 +46 -3 jakarta-ant/docs/manual/CoreTasks/java.html
Index: java.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/java.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- java.html 4 Sep 2002 11:05:16 -0000 1.14
+++ java.html 9 Feb 2003 12:17:16 -0000 1.15
@@ -91,13 +91,56 @@
</tr>
<tr>
<td valign="top">output</td>
- <td valign="top">Name of a file to write the output to.</td>
+ <td valign="top">Name of a file to which to write the output. If the
error stream
+ is not also redirected to a file or property, it will appear in this
output.</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">error</td>
+ <td valign="top">The file to which the standard error of the command
should be
+ redirected. </td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">logError</td>
+ <td valign="top">This attribute is used when you wish to see error
output in Ant's
+ log and you are redirecting output to a file/property.
The error
+ output will not be included in the output
file/property. If you
+ redirect error with the "error" or
"errorProperty"
+ attributes, this will have no effect.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">append</td>
- <td valign="top">whether output should be appended to or overwrite
- an existing file. Defaults to false.</td>
+ <td valign="top">Whether output and error files should be appended to or
overwritten.
+ Defaults to false.</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">outputproperty</td>
+ <td valign="top">The name of a property in which the output of the
+ command should be stored. Unless the error stream is redirected to a
separate
+ file or stream, this property will include the error output.</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">errorproperty</td>
+ <td valign="top">The name of a property in which the standard error of
the
+ command should be stored.</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">input</td>
+ <td valign="top">A file from which the executed command's standard input
+ is taken. This attribute is mutually exclusive with the
+ inputstring attribute</td>
+ <td align="center" valign="top">No</td>
+ </tr>
+ <tr>
+ <td valign="top">inputstring</td>
+ <td valign="top">A string which serves as the input stream for the
+ executed command. This attribute is mutually exclusive
with the
+ inputstring attribute.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
