ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce P4Base.java P4Sync.java
Date Sat, 12 Jan 2002 04:57:36 GMT
donaldp     02/01/11 20:57:36

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Base.java P4Sync.java
  Log:
  Migrate all the ant-independent code for
  
  native execution
  environment loading
  os detection
  
  into a new hierarchy aut.
  
  AUT basically being completely independent of Ant.
  
  Revision  Changes    Path
  1.13      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  
  Index: P4Base.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- P4Base.java	6 Jan 2002 02:30:43 -0000	1.12
  +++ P4Base.java	12 Jan 2002 04:57:36 -0000	1.13
  @@ -9,7 +9,7 @@
   
   import java.io.IOException;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.framework.exec.ExecOutputHandler;
  +import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.oro.text.perl.Perl5Util;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  
  
  
  1.6       +5 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java
  
  Index: P4Sync.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Sync.java	6 Jan 2002 02:30:43 -0000	1.5
  +++ P4Sync.java	12 Jan 2002 04:57:36 -0000	1.6
  @@ -82,19 +82,19 @@
    *
    * @author <A HREF="mailto:leslie.hughes@rubus.com">Les Hughes</A>
    */
  -public class P4Sync extends P4Base
  +public class P4Sync
  +    extends P4Base
   {
       private String m_syncCmd = "";
       private String m_label;
   
  -    public void setForce( final String force )
  +    public void setForce( final boolean force )
           throws TaskException
       {
  -        if( force == null && !m_label.equals( "" ) )
  +        if( force  )
           {
  -            throw new TaskException( "P4Sync: If you want to force, set force to non-null
string!" );
  +            m_p4CmdOpts = "-f";
           }
  -        m_p4CmdOpts = "-f";
       }
   
       public void setLabel( String label )
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message