|
@@ -11,8 +11,7 @@ import java.io.File; |
|
|
import java.io.IOException; |
|
|
import java.io.IOException; |
|
|
import org.apache.myrmidon.api.AbstractTask; |
|
|
import org.apache.myrmidon.api.AbstractTask; |
|
|
import org.apache.myrmidon.api.TaskException; |
|
|
import org.apache.myrmidon.api.TaskException; |
|
|
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.Commandline; |
|
|
import org.apache.tools.ant.types.Commandline; |
|
|
import org.apache.tools.ant.types.EnvironmentData; |
|
|
import org.apache.tools.ant.types.EnvironmentData; |
|
|
import org.apache.tools.ant.types.EnvironmentVariable; |
|
|
import org.apache.tools.ant.types.EnvironmentVariable; |
|
@@ -146,9 +145,8 @@ public class Cvs |
|
|
final Commandline command = buildCommandline(); |
|
|
final Commandline command = buildCommandline(); |
|
|
final EnvironmentData env = buildEnvironment(); |
|
|
final EnvironmentData env = buildEnvironment(); |
|
|
|
|
|
|
|
|
final Execute exe = new Execute(); |
|
|
|
|
|
exe.setOutput( new LogOutputStream( getLogger(), false ) ); |
|
|
|
|
|
exe.setError( new LogOutputStream( getLogger(), true ) ); |
|
|
|
|
|
|
|
|
final Execute2 exe = new Execute2(); |
|
|
|
|
|
setupLogger( exe ); |
|
|
if( m_dest == null ) m_dest = getBaseDirectory(); |
|
|
if( m_dest == null ) m_dest = getBaseDirectory(); |
|
|
exe.setWorkingDirectory( m_dest ); |
|
|
exe.setWorkingDirectory( m_dest ); |
|
|
|
|
|
|
|
|