antoine 2003/09/25 13:44:39
Modified: docs/manual/OptionalTasks Tag: ANT_16_BRANCH perforce.html
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.21.2.2 +15 -16 ant/docs/manual/OptionalTasks/perforce.html
Index: perforce.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/perforce.html,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- perforce.html 22 Sep 2003 16:46:07 -0000 1.21.2.1
+++ perforce.html 25 Sep 2003 20:44:39 -0000 1.21.2.2
@@ -22,10 +22,10 @@
<br>
<h2><a name="intro">Introduction</a></h2>
<p>These tasks provide an interface to the <a href="http://www.perforce.com" target="_top">Perforce</a>
SCM.
-The <code>org.apache.tools.ant.taskdefs.optional.perforce</code> package consists
of a simple framework to support
-p4 functionality as well as some Ant tasks encapsulating frequently used (by me :-) p4
commands.
-However, the addition of new p4 commands is a pretty simple task (see the source).
-Although it is possible to use these commands on the desktop,
+The <code>org.apache.tools.ant.taskdefs.optional.perforce</code> package consists
of a simple framework to support
+p4 functionality as well as some Ant tasks encapsulating frequently used (by me :-) p4
commands.
+However, the addition of new p4 commands is a pretty simple task (see the source).
+Although it is possible to use these commands on the desktop,
they were primarily intended to be used by automated build systems.</p>
<p><b>Note:</b> These tasks require the <a href="http://jakarta.apache.org/oro"
target="_top">oro 2.0.XXX</a> regular
@@ -79,7 +79,7 @@
<td><a href="#p4revert">P4Revert</a></td>
<td>Revert files</td>
</tr>
-
+
<tr>
<td><a href="#p4add">P4Add</a></td>
<td>Add files</td>
@@ -103,7 +103,7 @@
</table>
<h3>General P4 Properties</h3>
-<p>Each p4 task requires a number of settings, either through build-wide properties,
individual attributes
+<p>Each p4 task requires a number of settings, either through build-wide properties,
individual attributes
or environment variables. These are
</p>
<table border="1" cellpadding="2" cellspacing="0">
@@ -147,7 +147,7 @@
<p> Your local installation of Perforce may require other settings (e.g.
P4PASSWD, P4CONFIG). Many of these settings can be set using the globalopts
attribute (described below), but not all. If a setting cannot be set
-by the command-line options, then it can only be set outside of Ant as an
+by the command-line options, then it can only be set outside of Ant as an
environment variable.
</p>
<p>
@@ -245,7 +245,7 @@
<h2><a name="p4change">P4Change</a></h2>
<h3>Description:</h3>
-<p>Request a new changelist from the Perforce server.
+<p>Request a new changelist from the Perforce server.
This task sets the ${p4.change} property which can then be passed to <A HREF="#p4submit">P4Submit</A>,
<A HREF="#p4edit">P4Edit</A>, or <a HREF="#p4add">P4Add</A>, or
<a HREF="#p4delete">P4Delete</A>,
then to <A HREF="#p4submit">P4Submit</A>.
@@ -404,7 +404,7 @@
<h3>Examples</h3>
<pre>
<p4label
- name="NightlyBuild:${DSTAMP}:${TSTAMP}"
+ name="NightlyBuild:${DSTAMP}:${TSTAMP}"
desc="Auto Nightly Build"
lock="locked"
label="//firstdepot/...;//secondepot/foo/bar/..."
@@ -616,7 +616,7 @@
<td valign="top">Revert only unchanged files (p4 revert -a)</td>
<td valign="top" align="center">No</td>
</tr>
-
+
</table>
<h3>Examples</h3>
@@ -645,7 +645,7 @@
<tr>
<td valign="top">commandlength</td>
<td valign="top">A positive integer specifying the maximum length
- of the commandline when calling Perforce to add the files.
+ of the commandline when calling Perforce to add the files.
Defaults to 450, higher values mean faster execution,
but also possible failures.</td>
<td valign="top" align="center">No</td>
@@ -657,7 +657,7 @@
associated with the default changelist.</td>
<td valign="top" align="center">No</td>
</tr>
-
+
</table>
<h3>Examples</h3>
@@ -922,7 +922,6 @@
<pre>
<p4resolve
view="//depot/projects/projectfoo/main/src/Blah.java..."
- change="${p4.change}"
resolvemode="automatic"/>
</pre>
@@ -944,12 +943,12 @@
<td valign="top">V1.1</td>
<td valign="top">Fixed cross platform (NT/Unix) bug<br>
Refactored p4 output handling code<br>
- Refactored exec'ing code</td>
+ Refactored exec'ing code</td>
</tr>
<tr>
<td valign="top">Jan 2003</td>
<td valign="top">V1.2</td>
- <td valign="top">Added globalopts to P4Base to allow
+ <td valign="top">Added globalopts to P4Base to allow
additional global options to be set.<br>
Added p4fstat task</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
|