You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/01/06 03:07:26 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc JJTree.java
donaldp 02/01/05 18:07:26
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java
Log:
Use Execute2 abstraction
Revision Changes Path
1.16 +4 -6 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JJTree.java 30 Dec 2001 10:46:59 -0000 1.15
+++ JJTree.java 6 Jan 2002 02:07:26 -0000 1.16
@@ -13,8 +13,7 @@
import java.util.Hashtable;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
@@ -174,7 +173,7 @@
{
throw new TaskException( "Javacchome not set." );
}
- final Path classpath = cmdl.createClasspath( getProject() );
+ final Path classpath = cmdl.createClasspath();
classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
"/JavaCC.zip" );
classpath.addJavaRuntime();
@@ -183,9 +182,8 @@
arg.setValue( "-mx140M" );
arg.setValue( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
- final Execute exe = new Execute();
- exe.setOutput( new LogOutputStream( getLogger(), false ) );
- exe.setError( new LogOutputStream( getLogger(), false ) );
+ final Execute2 exe = new Execute2();
+ setupLogger( exe );
getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl.getCommandline() );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>