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 2001/12/23 04:20:01 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix Chmod.java
donaldp 01/12/22 19:20:01
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
ExecuteOn.java GenerateKey.java SignJar.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
Cab.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
Chmod.java
Log:
Remove failOnError attribute from Exec and thus always fail
Revision Changes Path
1.14 +3 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExecuteOn.java 2001/12/22 22:01:57 1.13
+++ ExecuteOn.java 2001/12/23 03:20:01 1.14
@@ -140,7 +140,7 @@
{
throw new TaskException( getName() + " doesn\'t support multiple srcfile elements." );
}
- srcFilePos = cmdl.createMarker();
+ srcFilePos = getCommand().createMarker();
return srcFilePos;
}
@@ -157,7 +157,7 @@
{
throw new TaskException( getName() + " doesn\'t support multiple targetfile elements." );
}
- targetFilePos = cmdl.createMarker();
+ targetFilePos = getCommand().createMarker();
srcIsFirst = ( srcFilePos != null );
return targetFilePos;
}
@@ -205,7 +205,7 @@
String[] targetFiles = new String[ targets.size() ];
targetFiles = (String[])targets.toArray( targetFiles );
- String[] orig = cmdl.getCommandline();
+ String[] orig = getCommand().getCommandline();
String[] result = new String[ orig.length + srcFiles.length + targetFiles.length ];
int srcIndex = orig.length;
1.12 +0 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
Index: GenerateKey.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GenerateKey.java 2001/12/22 12:59:30 1.11
+++ GenerateKey.java 2001/12/23 03:20:01 1.12
@@ -238,7 +238,6 @@
cmd.createArg().setValue( "" + validity );
}
- cmd.setFailonerror( true );
cmd.execute();
}
1.9 +0 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Index: SignJar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SignJar.java 2001/12/22 12:59:30 1.8
+++ SignJar.java 2001/12/23 03:20:01 1.9
@@ -328,9 +328,7 @@
cmd.createArg().setValue( alias );
getLogger().info( "Signing Jar : " + jarSource.getAbsolutePath() );
- cmd.setFailonerror( true );
cmd.execute();
}
-
}
1.13 +0 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Cab.java 2001/12/22 12:57:36 1.12
+++ Cab.java 2001/12/23 03:20:01 1.13
@@ -153,7 +153,6 @@
File outFile = null;
// die if cabarc fails
- exec.setFailonerror( true );
exec.setDir( baseDir );
if( !doVerbose )
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java
Index: Chmod.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Chmod.java 2001/12/22 23:38:37 1.1
+++ Chmod.java 2001/12/23 03:20:01 1.2
@@ -163,7 +163,7 @@
Execute execute = prepareExec();
try
{
- execute.setCommandline( cmdl.getCommandline() );
+ execute.setCommandline( getCommand().getCommandline() );
runExecute( execute );
}
catch( IOException e )
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>