antoine 2003/09/23 15:42:24
Modified: src/main/org/apache/tools/ant/launch Launcher.java
Log:
remove the -lib argument in Launcher if this is the last argument, since Main
does not know what to do with it
PR: 23358
Revision Changes Path
1.7 +8 -2 ant/src/main/org/apache/tools/ant/launch/Launcher.java
Index: Launcher.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Launcher.java 22 Sep 2003 21:10:10 -0000 1.6
+++ Launcher.java 23 Sep 2003 22:42:23 -0000 1.7
@@ -127,10 +127,16 @@
break;
}
}
- if (libPath.equals("")) {
+ if (args.length > 0 && args[args.length -1].equals("-lib")) {
+ // if the last argument is -lib
+ // remove it from the arguments passed to Launcher
+ //
+ newargs = new String[args.length - 1];
+ System.arraycopy(args, 0, newargs, 0, args.length -1);
+ } else if (libPath.equals("")) {
newargs = new String[args.length];
System.arraycopy(args, 0, newargs, 0, args.length);
- } else {
+ } else {
newargs = new String[args.length - 2];
// copy the beginning of the args array
if (argcount > 0 ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
