conor 2003/01/28 05:57:46
Modified: docs/manual/OptionalTasks perforce.html
src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Base.java
Log:
Provide mechanism for additional global options on perforce tasks
PR: 14395
Submitted by: Matt Bishop
Revision Changes Path
1.17 +26 -4 jakarta-ant/docs/manual/OptionalTasks/perforce.html
Index: perforce.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/perforce.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
--- perforce.html 4 Sep 2002 11:05:18 -0000 1.16
+++ perforce.html 28 Jan 2003 13:57:45 -0000 1.17
@@ -8,8 +8,9 @@
<ul>
<li>Les Hughes (<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>)</li>
<li>Kirk Wylie (<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>)</li>
+ <li>Matt Bishop (<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>)</li>
</ul>
-<p>Version 1.1 - 2001/01/09</p>
+<p>Version 1.2 - 2002/10/08</p>
<hr>
<h2>Contents</h2>
<ul>
@@ -122,8 +123,11 @@
</tr>
</table>
-<p>
-Your local installation of Perforce may require other settings (e.g.
P4PASSWD, P4CONFIG). At the moment, these can only be set outside of Ant, as
environment variables.
+<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
+environment variable.
</p>
<p>
Additionally, you may also specify the following attributes:
@@ -143,6 +147,16 @@
if an error is returned from the p4 command.</td>
<td valign="top">No; defaults to true.</td>
</tr>
+ <tr>
+ <td valign="top">globalopts<br></td>
+ <td valign="top">Specifies global options for perforce to use while
+ executing the task. These properties should be concatenated into one
+ string,<br>
+ such as "-P <i>password</i> -C EUCJIS". Use the command-line option
+ syntax, NOT the environment variable names. See the<br>
+ Perforce Command Reference for details.</td>
+ <td valign="top">No<br></td>
+ </tr>
</table>
</p>
@@ -569,7 +583,15 @@
<tr>
<td valign="top">Jan 2001</td>
<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>
+ <td valign="top">Fixed cross platform (NT/Unix) bug<br>
+ Refactored p4 output handling code<br>
+ Refactored exec'ing code</td>
+</tr>
+<tr>
+ <td valign="top">Nov 2002</td>
+ <td valign="top">V1.2</td>
+ <td valign="top">Added globalopts to P4Base to allow<br>
+ additional global options to be set.</td>
</tr>
</table>
<hr>
1.19 +11 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
--- P4Base.java 25 Jul 2002 15:21:18 -0000 1.18
+++ P4Base.java 28 Jan 2003 13:57:46 -0000 1.19
@@ -134,6 +134,14 @@
}
/**
+ * Set global P4 options; Used on all
+ * of the Perforce tasks.
+ */
+ public void setGlobalopts(String P4Opts) {
+ this.P4Opts = P4Opts;
+ }
+
+ /**
* The client, branch or label view to operate upon;
* optional default "//..."
*/
@@ -198,6 +206,9 @@
}
if (P4Client != null && P4Client.length() != 0) {
commandline.createArgument().setValue(P4Client);
+ }
+ if (P4Opts != null && P4Opts.length() != 0) {
+ commandline.createArgument().setValue(P4Opts);
}
commandline.createArgument().setLine(command);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
