Browse Source

adding category to Perforce tasks

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273976 13f79535-47bb-0310-9956-ffa450edef68
master
Erik Hatcher 22 years ago
parent
commit
b5a8292e57
3 changed files with 12 additions and 6 deletions
  1. +8
    -6
      src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java
  2. +1
    -0
      src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java
  3. +3
    -0
      src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java

+ 8
- 6
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java View File

@@ -69,7 +69,7 @@ import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileSet;


/**
/**
* P4Fstat - find out which files are under Perforce control and which are not. * P4Fstat - find out which files are under Perforce control and which are not.
* *
* <br><b>Example Usage:</b><br> * <br><b>Example Usage:</b><br>
@@ -86,6 +86,8 @@ import org.apache.tools.ant.types.FileSet;
* @author <A HREF="mailto:miha@softhome.net">Miha</A> * @author <A HREF="mailto:miha@softhome.net">Miha</A>
* @author <A HREF="mailto:leslie.hughes@rubus.com">Les Hughes</A> * @author <A HREF="mailto:leslie.hughes@rubus.com">Les Hughes</A>
* @author <A HREF="mailto:ashundi@tibco.com">Anli Shundi</A> * @author <A HREF="mailto:ashundi@tibco.com">Anli Shundi</A>
*
* @ant.task category="scm"
*/ */
public class P4Fstat extends P4Base { public class P4Fstat extends P4Base {


@@ -103,9 +105,9 @@ public class P4Fstat extends P4Base {
private int doneFileNum = 0; private int doneFileNum = 0;
private boolean debug = false; private boolean debug = false;


private static final String EXISTING_HEADER
private static final String EXISTING_HEADER
= "Following files exist in perforce"; = "Following files exist in perforce";
private static final String NONEXISTING_HEADER
private static final String NONEXISTING_HEADER
= "Following files do not exist in perforce"; = "Following files do not exist in perforce";




@@ -117,7 +119,7 @@ public class P4Fstat extends P4Base {
} else if (filter.equalsIgnoreCase("non-existing")) { } else if (filter.equalsIgnoreCase("non-existing")) {
show = SHOW_NON_EXISTING; show = SHOW_NON_EXISTING;
} else { } else {
throw new BuildException("P4Fstat: ShowFilter should be one of: "
throw new BuildException("P4Fstat: ShowFilter should be one of: "
+ "all, existing, non-existing"); + "all, existing, non-existing");
} }
} }
@@ -125,7 +127,7 @@ public class P4Fstat extends P4Base {


public void setChangelist(int changelist) throws BuildException { public void setChangelist(int changelist) throws BuildException {
if (changelist <= 0) { if (changelist <= 0) {
throw new BuildException("P4FStat: Changelist# should be a "
throw new BuildException("P4FStat: Changelist# should be a "
+ "positive number"); + "positive number");
} }


@@ -203,7 +205,7 @@ public class P4Fstat extends P4Base {


private void execP4Fstat(StringBuffer list) { private void execP4Fstat(StringBuffer list) {
if (debug) { if (debug) {
log("Executing fstat " + P4CmdOpts + " " + addCmd + list + "\n",
log("Executing fstat " + P4CmdOpts + " " + addCmd + list + "\n",
Project.MSG_INFO); Project.MSG_INFO);
} }
execP4Command("fstat " + P4CmdOpts + " " + addCmd + list, handler); execP4Command("fstat " + P4CmdOpts + " " + addCmd + list, handler);


+ 1
- 0
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java View File

@@ -71,6 +71,7 @@ import org.apache.tools.ant.BuildException;
* *
* @author <A HREF="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</A> * @author <A HREF="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</A>
* *
* @ant.task category="scm"
*/ */


public class P4Integrate extends P4Base { public class P4Integrate extends P4Base {


+ 3
- 0
src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java View File

@@ -61,6 +61,9 @@ package org.apache.tools.ant.taskdefs.optional.perforce;


import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;


/**
* @ant.task category="scm"
*/
public class P4Resolve extends P4Base{ public class P4Resolve extends P4Base{
private String resolvemode = null; private String resolvemode = null;




Loading…
Cancel
Save