From 0afee61434d34d76d91e9f2c50acd846fe0d8ade Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Tue, 28 Jan 2003 13:57:46 +0000
Subject: [PATCH] Provide mechanism for additional global options on perforce
 tasks

PR:	14395
Submitted by:	Matt Bishop


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273916 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/OptionalTasks/perforce.html       | 30 ++++++++++++++++---
 .../taskdefs/optional/perforce/P4Base.java    | 11 +++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html
index 06640ec86..44b91fb55 100644
--- a/docs/manual/OptionalTasks/perforce.html
+++ b/docs/manual/OptionalTasks/perforce.html
@@ -8,8 +8,9 @@
 <ul>
     <li>Les Hughes (<a href="mailto:leslie.hughes@rubus.com">leslie.hughes@rubus.com</a>)</li>
     <li>Kirk Wylie (<a href="mailto:kirk@radik.com">kirk@radik.com</a>)</li>
+    <li>Matt Bishop (<a href="mailto:matt@thebishops.org">matt@thebishops.org</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 @@ or environment variables. These are
   </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 @@ Additionally, you may also specify the following attributes:
      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 @@ and submit
 <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>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index b0e11d7e2..fad01e21a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -132,6 +132,14 @@ public abstract class P4Base extends org.apache.tools.ant.Task {
     public void setUser(String P4User) {
         this.P4User = "-u" + P4User;
     }
+    
+    /**
+     * 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;
@@ -199,6 +207,9 @@ public abstract class P4Base extends org.apache.tools.ant.Task {
             if (P4Client != null && P4Client.length() != 0) {
                 commandline.createArgument().setValue(P4Client);
             }
+            if (P4Opts != null && P4Opts.length() != 0) {
+                commandline.createArgument().setValue(P4Opts);
+            }
             commandline.createArgument().setLine(command);
 
             log(commandline.describeCommand(), Project.MSG_VERBOSE);