diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index acd605588..7e5fe0156 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -121,6 +121,7 @@ ccmcreatetask=org.apache.tools.ant.taskdefs.optional.ccm.CCMCreateTask jpcoverage=org.apache.tools.ant.taskdefs.optional.sitraka.Coverage jpcovmerge=org.apache.tools.ant.taskdefs.optional.sitraka.CovMerge jpcovreport=org.apache.tools.ant.taskdefs.optional.sitraka.CovReport +p4add=org.apache.tools.ant.taskdefs.optional.perforce.P4Add # deprecated ant tasks (kept for back compatibility) javadoc2=org.apache.tools.ant.taskdefs.Javadoc diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java new file mode 100644 index 000000000..8a0472983 --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -0,0 +1,144 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + +package org.apache.tools.ant.taskdefs.optional.perforce; + + +import java.io.File; +import java.util.Vector; +import org.apache.tools.ant.*; +import org.apache.tools.ant.types.FileSet; + +/** P4Add - add the specified files to perforce. + * + * Example Usage: + * + * + * + * + * + *
FunctionCommand
Add files using P4USER, P4PORT and P4CLIENT settings specified<P4add
P4view="//projects/foo/main/source/..."
P4User="fbloggs"
P4Port="km01:1666"
P4Client="fbloggsclient">
<fileset basedir="dir" includes="**/*.java">
</p4add>
Add files using P4USER, P4PORT and P4CLIENT settings defined in environment<P4add P4view="//projects/foo/main/source/..." />
<fileset basedir="dir" includes="**/*.java">
</p4add>
Specify the length of command line arguments to pass to each invocation of p4<p4add Commandlength="450">
+ * + * @author Les Hughes + * @author Anli Shundi + */ +public class P4Add extends P4Base { + + private int m_changelist; + private String addCmd = ""; + private Vector filesets = new Vector(); + private int m_cmdLength = 450; + + public void setCommandlength(int len) throws BuildException { + if(len <= 0) + throw new BuildException("P4Add: Commandlength should be a positive number"); + this.m_cmdLength = len; + } + + public void setChangelist(int changelist) throws BuildException { + if(changelist <= 0) + throw new BuildException("P4Add: Changelist# should be a positive number"); + + this.m_changelist = changelist; + } + + public void addFileset(FileSet set) { + filesets.addElement(set); + } + + public void execute() throws BuildException { + + if (P4View != null) { + addCmd = P4View; + } + + P4CmdOpts = (m_changelist > 0) ? ("-c " + m_changelist) : ""; + + StringBuffer filelist = new StringBuffer(); + + for (int i=0; i m_cmdLength) { + execP4Add(filelist); + filelist.setLength(0); + } + } + if (filelist.length() > 0) { + execP4Add(filelist); + } + } else { + log("No files specified to add!", Project.MSG_WARN); + } + } + + } + + private void execP4Add(StringBuffer list) { + log("Execing add "+P4CmdOpts+" "+addCmd+list, Project.MSG_INFO); + + execP4Command("-s add "+P4CmdOpts+" "+addCmd+list, new SimpleP4OutputHandler(this)); + } +}