cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-05-26 Thread mbenson 
mbenson 2005/05/26 15:11:57

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Make -projecthelp output display even in -quiet mode.
  PR: 17471
  
  Revision  ChangesPath
  1.120 +1 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- Main.java 23 May 2005 21:52:35 -  1.119
  +++ Main.java 26 May 2005 22:11:57 -  1.120
  @@ -998,6 +998,6 @@
   }
   msg.append(lSep);
   }
  -project.log(msg.toString());
  +project.log(msg.toString(), Project.MSG_WARN);
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-05-16 Thread Steve Loughran 
Peter Reilly wrote:
[EMAIL PROTECTED] wrote:
stevel  2005/05/13 14:57:23
   @@ -424,6 +413,15 @@
  throw new BuildException(
  "Niceness value is out of the range 1-10");
  }
 +} else if (arg.equals("-cp") || arg.equals("-lib")) {
 +//catch script/ant mismatch with a meaningful message
 +//we could ignore it, but there are likely to be other
 +//version problems, so we stamp down on the 
configuration now
 +String msg = "Ant's Main method is being handed "
 ++ "an option "+arg+" that is only for the 
launcher class."
 ++ "\nThis can be caused by a version 
mismatch between "
 ++ "the ant script/.bat file and Ant itself.";
 +throw new BuildException(msg);
  } else if (arg.startsWith("-")) {
  // we don't have any more args to recognize!
  String msg = "Unknown argument: " + arg;

 

I do not think that this will happen. The problem was that there was a 
mismatch
between the script (1.6.3) and the ant jars (1.6.2) which includes 
compatible versions
of the Main(ant.jar) and Launcher(ant-launcher.jar) classes.

The problem was that some linux distributions are including ant via the 
jpackage project.
This uses a file - /etc/ant.conf, which describes where ant is located. 
To cooperate with the
jpackage project, ant's ant script reads this file. The ant.conf file 
overwrites the environment variable
ANT_HOME.
- snippet from the ant.conf file 
if $no_config ; then
 # Disable RPM layout
 rpm_mode=false
else
 # Use RPM layout
 rpm_mode=true

 # ANT_HOME for rpm layout
 ANT_HOME=/usr/share/ant
fi

This ANT_HOME is then used in the rest of the 1.6.3 script - causing it 
to use the locator.jar from ant.1.6.2.

I think that the jpackage people have updated the script to check if 
ANT_HOME is set already before setting it,
but this is not in the ant.1.6.2 package release.
I see. I think we ought to leave the logic in -it doesnt cost  much if 
not used, but we may want to tune the text a bit. Like you say, it 
should be a pretty rare occurence.

Maybe it should point to a Wiki URL or something that discusses this 
problem in detail.

The ant script could check if ANT_HOME has been modified by the call to 
ant.conf and warn the user.
ah, now that is paranoia. I like it.
-steve
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-05-16 Thread Peter Reilly 
[EMAIL PROTECTED] wrote:
stevel  2005/05/13 14:57:23
  
 @@ -424,6 +413,15 @@
  throw new BuildException(
  "Niceness value is out of the range 1-10");
  }
 +} else if (arg.equals("-cp") || arg.equals("-lib")) {
 +//catch script/ant mismatch with a meaningful message
 +//we could ignore it, but there are likely to be other
 +//version problems, so we stamp down on the configuration now
 +String msg = "Ant's Main method is being handed "
 ++ "an option "+arg+" that is only for the launcher class."
 ++ "\nThis can be caused by a version mismatch between "
 ++ "the ant script/.bat file and Ant itself.";
 +throw new BuildException(msg);
  } else if (arg.startsWith("-")) {
  // we don't have any more args to recognize!
  String msg = "Unknown argument: " + arg;

 

I do not think that this will happen. The problem was that there was a 
mismatch
between the script (1.6.3) and the ant jars (1.6.2) which includes 
compatible versions
of the Main(ant.jar) and Launcher(ant-launcher.jar) classes.

The problem was that some linux distributions are including ant via the 
jpackage project.
This uses a file - /etc/ant.conf, which describes where ant is located. 
To cooperate with the
jpackage project, ant's ant script reads this file. The ant.conf file 
overwrites the environment variable
ANT_HOME.
- snippet from the ant.conf file 
if $no_config ; then
 # Disable RPM layout
 rpm_mode=false
else
 # Use RPM layout
 rpm_mode=true

 # ANT_HOME for rpm layout
 ANT_HOME=/usr/share/ant
fi

This ANT_HOME is then used in the rest of the 1.6.3 script - causing it 
to use the locator.jar from ant.1.6.2.

I think that the jpackage people have updated the script to check if 
ANT_HOME is set already before setting it,
but this is not in the ant.1.6.2 package release.

The ant script could check if ANT_HOME has been modified by the call to 
ant.conf and warn the user.

Peter
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-05-13 Thread stevel 
stevel  2005/05/13 14:57:23

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  added a special case that detects -cp and -lib calls in Main, and tells the 
caller that they have a probable version mismatch.
  
  Revision  ChangesPath
  1.118 +13 -21ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- Main.java 26 Feb 2005 21:16:58 -  1.117
  +++ Main.java 13 May 2005 21:57:23 -  1.118
  @@ -29,6 +29,7 @@
   import org.apache.tools.ant.input.DefaultInputHandler;
   import org.apache.tools.ant.input.InputHandler;
   import org.apache.tools.ant.launch.AntMain;
  +import org.apache.tools.ant.util.FileUtils;
   
   
   /**
  @@ -212,20 +213,8 @@
*/
   private static void handleLogfile() {
   if (isLogFileUsed) {
  -if (out != null) {
  -try {
  -out.close();
  -} catch (final Exception e) {
  -//ignore
  -}
  -}
  -if (err != null) {
  -try {
  -err.close();
  -} catch (final Exception e) {
  -//ignore
  -}
  -}
  +FileUtils.close(out);
  +FileUtils.close(err);
   }
   }
   
  @@ -424,6 +413,15 @@
   throw new BuildException(
   "Niceness value is out of the range 1-10");
   }
  +} else if (arg.equals("-cp") || arg.equals("-lib")) {
  +//catch script/ant mismatch with a meaningful message
  +//we could ignore it, but there are likely to be other
  +//version problems, so we stamp down on the configuration now
  +String msg = "Ant's Main method is being handed "
  ++ "an option "+arg+" that is only for the launcher 
class."
  ++ "\nThis can be caused by a version mismatch 
between "
  ++ "the ant script/.bat file and Ant itself.";
  +throw new BuildException(msg);
   } else if (arg.startsWith("-")) {
   // we don't have any more args to recognize!
   String msg = "Unknown argument: " + arg;
  @@ -476,13 +474,7 @@
   System.out.println("Could not load property file "
  + filename + ": " + e.getMessage());
   } finally {
  -if (fis != null) {
  -try {
  -fis.close();
  -} catch (IOException e) {
  -// ignore
  -}
  -}
  +FileUtils.close(fis);
   }
   
   // ensure that -D properties take precedence
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-02-26 Thread jkf 
jkf 2005/02/26 13:16:58

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  renamed hidden variables
  
  Revision  ChangesPath
  1.117 +9 -9  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- Main.java 21 Jan 2005 11:24:26 -  1.116
  +++ Main.java 26 Feb 2005 21:16:58 -  1.117
  @@ -597,9 +597,9 @@
   addBuildListeners(project);
   addInputHandler(project);
   
  -PrintStream err = System.err;
  -PrintStream out = System.out;
  -InputStream in = System.in;
  +PrintStream savedErr = System.err;
  +PrintStream savedOut = System.out;
  +InputStream savedIn = System.in;
   
   // use a system manager that prevents from System.exit()
   SecurityManager oldsm = null;
  @@ -673,16 +673,16 @@
   System.setSecurityManager(oldsm);
   }
   
  -System.setOut(out);
  -System.setErr(err);
  -System.setIn(in);
  +System.setOut(savedOut);
  +System.setErr(savedErr);
  +System.setIn(savedIn);
   }
   } catch (RuntimeException exc) {
   error = exc;
   throw exc;
  -} catch (Error err) {
  -error = err;
  -throw err;
  +} catch (Error e) {
  +error = e;
  +throw e;
   } finally {
   if (!projectHelp) {
   project.fireBuildFinished(error);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-01-21 Thread peterreilly 
peterreilly2005/01/21 03:24:26

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  unused import
  
  Revision  ChangesPath
  1.116 +0 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- Main.java 21 Jan 2005 07:12:52 -  1.115
  +++ Main.java 21 Jan 2005 11:24:26 -  1.116
  @@ -28,7 +28,6 @@
   import java.util.Vector;
   import org.apache.tools.ant.input.DefaultInputHandler;
   import org.apache.tools.ant.input.InputHandler;
  -import org.apache.tools.ant.util.JavaEnvUtils;
   import org.apache.tools.ant.launch.AntMain;
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-01-20 Thread stevel 
stevel  2005/01/20 07:58:47

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  I pulled out a bit of pre-1.2 testing, but the code it wrapped is probably 
unneeded, as we dont set a security manager.
  
  Revision  ChangesPath
  1.114 +1 -5  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- Main.java 10 Jan 2005 20:18:27 -  1.113
  +++ Main.java 20 Jan 2005 15:58:47 -  1.114
  @@ -603,17 +603,13 @@
   InputStream in = System.in;
   
   // use a system manager that prevents from System.exit()
  -// only in JDK > 1.1
   SecurityManager oldsm = null;
  -if (!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_0)
  -&& !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
  -oldsm = System.getSecurityManager();
  +oldsm = System.getSecurityManager();
   
   //SecurityManager can not be installed here for backwards
   //compatibility reasons (PD). Needs to be loaded prior to
   //ant class if we are going to implement it.
   //System.setSecurityManager(new NoExitSecurityManager());
  -}
   try {
   if (allowInput) {
   project.setDefaultInputStream(System.in);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2005-01-10 Thread jkf 
jkf 2005/01/10 12:18:27

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Minor update in ant help. description for -nouserlib and -noclasspath were on 
one line.
  
  Revision  ChangesPath
  1.113 +2 -2  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- Main.java 5 Oct 2004 08:37:00 -   1.112
  +++ Main.java 10 Jan 2005 20:18:27 -  1.113
  @@ -838,8 +838,8 @@
   msg.append("  -nice  number  A niceness value for the main 
thread:" + lSep
  + " 1 (lowest) to 10 (highest); 5 
is the default"
  + lSep);
  -msg.append("  -nouserlib Run ant without using the jar 
files from ${user.home}/"
  -   + ".ant/lib");
  +msg.append("  -nouserlib Run ant without using the jar 
files from" + lSep
  +   + " ${user.home}/.ant/lib" + 
lSep);
   msg.append("  -noclasspath   Run ant without using 
CLASSPATH");
   System.out.println(msg.toString());
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-10-05 Thread peterreilly 
peterreilly2004/10/05 01:09:31

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  typo
  
  Revision  ChangesPath
  1.111 +1 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Main.java 24 Sep 2004 08:17:34 -  1.110
  +++ Main.java 5 Oct 2004 08:09:31 -   1.111
  @@ -838,7 +838,7 @@
   msg.append("  -nice  number  A niceness value for the main 
thread:" + lSep
  + " 1 (lowest) to 10 (highest); 5 
is the default"
  + lSep);
  -msg.append("  -nouserlib Run ant within using the jar 
files from ${user.home}/"
  +msg.append("  -nouserlib Run ant without using the jar 
files from ${user.home}/"
  + ".ant/lib");
   System.out.println(msg.toString());
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-09-24 Thread peterreilly 
peterreilly2004/09/24 01:17:34

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  checkstyle
  
  Revision  ChangesPath
  1.110 +20 -15ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- Main.java 24 Sep 2004 08:13:25 -  1.109
  +++ Main.java 24 Sep 2004 08:17:34 -  1.110
  @@ -117,7 +117,7 @@
   /**
* optional thread priority
*/
  -private Integer threadPriority=null;
  +private Integer threadPriority = null;
   
   /**
* Prints the message of the Throwable if it (the message) is not
  @@ -410,18 +410,18 @@
   keepGoingMode = true;
   } else if (arg.equals("-nice")) {
   try {
  -threadPriority=Integer.decode(args[i + 1]);
  +threadPriority = Integer.decode(args[i + 1]);
   } catch (ArrayIndexOutOfBoundsException aioobe) {
   throw new BuildException(
  -"You must supply a niceness value (1-10)"+
  -" after the -nice option");
  +"You must supply a niceness value (1-10)"
  ++ " after the -nice option");
   } catch (NumberFormatException e) {
  -throw new BuildException("Unrecognized niceness value: " 
+
  -args[i + 1]);
  +throw new BuildException("Unrecognized niceness value: "
  + + args[i + 1]);
   }
   i++;
  -if(threadPriority.intValue()Thread.MAX_PRIORITY) {
  +if (threadPriority.intValue() < Thread.MIN_PRIORITY
  +|| threadPriority.intValue() > Thread.MAX_PRIORITY) {
   throw new BuildException(
   "Niceness value is out of the range 1-10");
   }
  @@ -631,7 +631,7 @@
   if (threadPriority != null) {
   try {
   project.log("Setting Ant's thread priority to "
  -+ threadPriority,Project.MSG_VERBOSE);
  ++ threadPriority, Project.MSG_VERBOSE);
   
Thread.currentThread().setPriority(threadPriority.intValue());
   } catch (SecurityException swallowed) {
   //we cannot set the priority here.
  @@ -814,12 +814,15 @@
   msg.append("  -quiet, -q be extra quiet" + lSep);
   msg.append("  -verbose, -v   be extra verbose" + lSep);
   msg.append("  -debug, -d print debugging information" + 
lSep);
  -msg.append("  -emacs, -e produce logging information 
without adornments" + lSep);
  -msg.append("  -lib specifies a path to search for 
jars and classes" + lSep);
  +msg.append("  -emacs, -e produce logging information 
without adornments"
  +   + lSep);
  +msg.append("  -lib specifies a path to search for 
jars and classes"
  +   + lSep);
   msg.append("  -logfile use given file for log" + lSep);
   msg.append("-l ''" + lSep);
   msg.append("  -logger the class which is to perform 
logging" + lSep);
  -msg.append("  -listener   add an instance of class as a 
project listener" + lSep);
  +msg.append("  -listener   add an instance of class as a 
project listener"
  +   + lSep);
   msg.append("  -noinput   do not allow interactive input" 
+ lSep);
   msg.append("  -buildfile   use given buildfile" + lSep);
   msg.append("-file  ''" + lSep);
  @@ -832,8 +835,9 @@
   msg.append("  -inputhandler   the class which will handle 
input requests" + lSep);
   msg.append("  -find(s)earch for buildfile towards 
the root of" + lSep);
   msg.append("-s the filesystem and use it" + 
lSep);
  -msg.append("  -nice  number  A niceness value for the main 
thread:" + lSep +
  -   " 1 (lowest) to 10 (highest); 5 
is the default" + lSep);
  +msg.append("  -nice  number  A niceness value for the main 
thread:" + lSep
  +   + " 1 (lowest) to 10 (highest); 5 
is the default"
  +   + lSep);
   msg.append("  -nouserlib Run ant within using the jar 
files from ${user.home}/"
  + ".ant/lib");
   Sy

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-06-18 Thread mbenson 
mbenson 2004/06/18 06:42:04

  Modified:src/main/org/apache/tools/ant/taskdefs Execute.java
   src/main/org/apache/tools/ant Main.java
  Log:
  Exit status fixes.
  
  Revision  ChangesPath
  1.82  +2 -2  ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Execute.java  27 Apr 2004 18:14:54 -  1.81
  +++ Execute.java  18 Jun 2004 13:42:03 -  1.82
  @@ -575,7 +575,7 @@
*/
   public static boolean isFailure(int exitValue) {
   if (Os.isFamily("openvms")) {
  -// odd exit value signals failure
  +// even exit value signals failure
   return (exitValue % 2) == 0;
   } else {
   // non zero exit value signals failure
  
  
  
  1.108 +1 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- Main.java 17 Jun 2004 20:33:13 -  1.107
  +++ Main.java 18 Jun 2004 13:42:04 -  1.108
  @@ -189,7 +189,7 @@
   exitCode = 0;
   } catch (ExitStatusException ese) {
   exitCode = ese.getStatus();
  -if (exitCode > 0) {
  +if (exitCode != 0) {
   throw ese;
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-04-20 Thread mbenson 
mbenson 2004/04/20 12:27:54

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Switch getParentFile(File) to delegate to File.getParentFile() and deprecate.
  
  Revision  ChangesPath
  1.106 +5 -6  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- Main.java 17 Mar 2004 22:06:47 -  1.105
  +++ Main.java 20 Apr 2004 19:27:54 -  1.106
  @@ -506,20 +506,19 @@
* Helper to get the parent file for a given file.
* 
* Added to simulate File.getParentFile() from JDK 1.2.
  + * @deprecated
*
* @param file   File to find parent of. Must not be null.
* @return   Parent file or null if none
*/
   private File getParentFile(File file) {
  -String filename = file.getAbsolutePath();
  -file = new File(filename);
  -filename = file.getParent();
  +File parent = file.getParentFile();
   
  -if (filename != null && msgOutputLevel >= Project.MSG_VERBOSE) {
  -System.out.println("Searching in " + filename);
  +if (parent != null && msgOutputLevel >= Project.MSG_VERBOSE) {
  +System.out.println("Searching in " + parent.getAbsolutePath());
   }
   
  -return (filename == null) ? null : new File(filename);
  +return parent;
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-03-17 Thread mbenson 
mbenson 2004/03/17 14:06:47

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  ant -p swallows (configuration) errors silently.
  PR:  27732
  
  Revision  ChangesPath
  1.105 +2 -0  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- Main.java 9 Mar 2004 16:47:59 -   1.104
  +++ Main.java 17 Mar 2004 22:06:47 -  1.105
  @@ -685,6 +685,8 @@
   } finally {
   if (!projectHelp) {
   project.fireBuildFinished(error);
  +} else if (error != null) {
  +project.log(error.toString(), Project.MSG_ERR);
   }
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2004-02-04 Thread antoine 
antoine 2004/02/04 14:08:16

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  bring back original copyright years
  
  Revision  ChangesPath
  1.102 +1 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Main.java 4 Feb 2004 20:37:22 -   1.101
  +++ Main.java 4 Feb 2004 22:08:16 -   1.102
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2004 Apache Software Foundation
  + * Copyright  2000-2004 Apache Software Foundation
*
*  Licensed under the Apache License, Version 2.0 (the "License");
*  you may not use this file except in compliance with the License.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

AW: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-25 Thread Antoine Lévy-Lambert 
Patch submitted, thanks.

-Ursprüngliche Nachricht-
Von: news [mailto:[EMAIL PROTECTED] Auftrag von Knut Wannheden
Gesendet: Donnerstag, 25. September 2003 00:01
An: [EMAIL PROTECTED]
Betreff: Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java


The attached patch should make the python script work.

--knut

> Yes, I do not know python, so please do !!!
> I did not change the os/2 script either.




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-24 Thread Knut Wannheden 
The attached patch should make the python script work.

--knut

> Yes, I do not know python, so please do !!!
> I did not change the os/2 script either.


begin 666 runant-python-launcher-patch.txt
[EMAIL PROTECTED](')U;F%N="YP>0T*/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/0T*4D-3
M(&9I;&4Z("]H;VUE+V-V&5C=71A8FQE+W-C2XB#0HK(" @(" @("!E;'[EMAIL PROTECTED] @(" @(" @(" @
M($I!5D%#340@/2!O&ES=',H;&%U;F-H97)?:F%R*3H-"B @(" @<')I;G0@)U5N86)L92!T;R!L
M;V-A=&[EMAIL PROTECTED]:&5R+FIA<[EMAIL PROTECTED]@=&[EMAIL PROTECTED]"!I="!I
M;B E[EMAIL PROTECTED]
[EMAIL PROTECTED]"BL@(" @3$]#04Q#3$%34U!!5$@@*ST@;W,N<&%T:'-E
M<" K(&]S+F5N=FER;VY;)TQ/0T%,0TQ!4U-0051()UT-"BL-"BM!3E1?3U!4
M4R ]("(B#0H@:68@;W,N96YV:7)O;BYH87-?:V5Y*"=!3E1?3U!44R<[EMAIL PROTECTED]
M+2 @("!!3E1?3U!44R ]('-T[EMAIL PROTECTED],G*3H-"BL@(" @04Y47T%2
M1U,@/2!O

AW: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-23 Thread Antoine Lévy-Lambert 
Yes, I do not know python, so please do !!!
I did not change the os/2 script either.
Cheers,
Antoine

-Ursprüngliche Nachricht-
Von: news [mailto:[EMAIL PROTECTED] Auftrag von Knut Wannheden
Gesendet: Dienstag, 23. September 2003 10:04
An: [EMAIL PROTECTED]
Betreff: Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java


Antoine,

I noticed that the runant.py wasn't updated in the same run.  Do you want me
to write a patch for this?

--knut

> antoine 2003/09/22 14:10:10
>
>   Modified:src/script ant ant.bat runant.pl
>src/main/org/apache/tools/ant/launch Launcher.java
>src/main/org/apache/tools/ant Main.java
>   Log:
>   adding a new supported command line argument -lib
>   this command line argument is eaten by Launcher
>   shell scripts reworked to pass the classpath in the right location
>




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-23 Thread Knut Wannheden 
Antoine,

I noticed that the runant.py wasn't updated in the same run.  Do you want me
to write a patch for this?

--knut

> antoine 2003/09/22 14:10:10
>
>   Modified:src/script ant ant.bat runant.pl
>src/main/org/apache/tools/ant/launch Launcher.java
>src/main/org/apache/tools/ant Main.java
>   Log:
>   adding a new supported command line argument -lib
>   this command line argument is eaten by Launcher
>   shell scripts reworked to pass the classpath in the right location
>




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-22 Thread antoine 
antoine 2003/09/22 14:15:41

  Modified:src/script Tag: ANT_16_BRANCH ant ant.bat runant.pl
   src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Launcher.java
   src/main/org/apache/tools/ant Tag: ANT_16_BRANCH Main.java
  Log:
  Merge last changes from HEAD
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.38.2.1  +4 -8  ant/src/script/ant
  
  Index: ant
  ===
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.38
  retrieving revision 1.38.2.1
  diff -u -r1.38 -r1.38.2.1
  --- ant   10 Jul 2003 11:29:38 -  1.38
  +++ ant   22 Sep 2003 21:15:41 -  1.38.2.1
  @@ -100,10 +100,6 @@
 exit 1
   fi
   
  -if [ -n "$CLASSPATH" ] ; then
  -  LOCALCLASSPATH="$CLASSPATH"
  -fi
  -
   # in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
   if $rpm_mode; then
 JAVALIBDIR=/usr/share/java
  @@ -156,14 +152,14 @@
   
   if [ -n "$CYGHOME" ]; then
 if [ -n "$JIKESPATH" ]; then
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
-Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.launch.Launcher $ANT_ARGS 
"$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
-Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.launch.Launcher $ANT_ARGS 
"$@" -lib "$CLASSPATH"
 else
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" -lib "$CLASSPATH"
 fi
   else
 if [ -n "$JIKESPATH" ]; then
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" -lib "$CLASSPATH"
 else
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" 
-lib "$CLASSPATH"
 fi
   fi
  
  
  
  1.32.2.1  +11 -1 ant/src/script/ant.bat
  
  Index: ant.bat
  ===
  RCS file: /home/cvs/ant/src/script/ant.bat,v
  retrieving revision 1.32
  retrieving revision 1.32.2.1
  diff -u -r1.32 -r1.32.2.1
  --- ant.bat   10 Jul 2003 11:49:08 -  1.32
  +++ ant.bat   22 Sep 2003 21:15:41 -  1.32.2.1
  @@ -54,7 +54,7 @@
   
   :checkJava
   set _JAVACMD=%JAVACMD%
  -set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar;%CLASSPATH%
  +set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar
   
   if "%JAVA_HOME%" == "" goto noJavaHome
   if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
  @@ -68,11 +68,21 @@
   if not "%JIKESPATH%"=="" goto runAntWithJikes
   
   :runAnt
  +if not "%CLASSPATH%"=="" goto runAntWithClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% 
%ANT_CMD_LINE_ARGS%
   goto end
   
  +:runAntWithClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% 
%ANT_CMD_LINE_ARGS% -lib "%CLASSPATH%"
  +goto end
  +
   :runAntWithJikes
  +if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" 
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithJikesAndClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" 
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% -lib 
"%CLASSPATH%"
   goto end
   
   :end
  
  
  
  1.7.2.1   +24 -34ant/src/script/runant.pl
  
  Index: runant.pl
  ===
  RCS file: /home/cvs/ant/src/script/runant.pl,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- runant.pl 1 Sep 2003 10:52:43 -   1.7
  +++ runant.pl 22 Sep 2003 21:15:41 -  1.7.2.1
  @@ -39,7 +39,7 @@
   #use warnings;
   
   #and set $debug to 1 to turn on trace info
  -my $debug=0;
  +my $debug=1;
   
   ###
   #
  @@ -74,26 +74,7 @@

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-22 Thread antoine 
antoine 2003/09/22 14:10:10

  Modified:src/script ant ant.bat runant.pl
   src/main/org/apache/tools/ant/launch Launcher.java
   src/main/org/apache/tools/ant Main.java
  Log:
  adding a new supported command line argument -lib
  this command line argument is eaten by Launcher
  shell scripts reworked to pass the classpath in the right location
  
  Revision  ChangesPath
  1.39  +4 -8  ant/src/script/ant
  
  Index: ant
  ===
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ant   10 Jul 2003 11:29:38 -  1.38
  +++ ant   22 Sep 2003 21:10:10 -  1.39
  @@ -100,10 +100,6 @@
 exit 1
   fi
   
  -if [ -n "$CLASSPATH" ] ; then
  -  LOCALCLASSPATH="$CLASSPATH"
  -fi
  -
   # in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
   if $rpm_mode; then
 JAVALIBDIR=/usr/share/java
  @@ -156,14 +152,14 @@
   
   if [ -n "$CYGHOME" ]; then
 if [ -n "$JIKESPATH" ]; then
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
-Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.launch.Launcher $ANT_ARGS 
"$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
-Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.launch.Launcher $ANT_ARGS 
"$@" -lib "$CLASSPATH"
 else
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" -lib "$CLASSPATH"
 fi
   else
 if [ -n "$JIKESPATH" ]; then
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" 
org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" -lib "$CLASSPATH"
 else
  -exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@"
  +exec "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH" 
-Dant.home="${ANT_HOME}" org.apache.tools.ant.launch.Launcher $ANT_ARGS "$@" 
-lib "$CLASSPATH"
 fi
   fi
  
  
  
  1.33  +11 -1 ant/src/script/ant.bat
  
  Index: ant.bat
  ===
  RCS file: /home/cvs/ant/src/script/ant.bat,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ant.bat   10 Jul 2003 11:49:08 -  1.32
  +++ ant.bat   22 Sep 2003 21:10:10 -  1.33
  @@ -54,7 +54,7 @@
   
   :checkJava
   set _JAVACMD=%JAVACMD%
  -set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar;%CLASSPATH%
  +set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar
   
   if "%JAVA_HOME%" == "" goto noJavaHome
   if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
  @@ -68,11 +68,21 @@
   if not "%JIKESPATH%"=="" goto runAntWithJikes
   
   :runAnt
  +if not "%CLASSPATH%"=="" goto runAntWithClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% 
%ANT_CMD_LINE_ARGS%
   goto end
   
  +:runAntWithClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% 
%ANT_CMD_LINE_ARGS% -lib "%CLASSPATH%"
  +goto end
  +
   :runAntWithJikes
  +if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
   "%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" 
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
  +goto end
  +
  +:runAntWithJikesAndClasspath
  +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" 
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" 
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% -lib 
"%CLASSPATH%"
   goto end
   
   :end
  
  
  
  1.8   +24 -34ant/src/script/runant.pl
  
  Index: runant.pl
  ===
  RCS file: /home/cvs/ant/src/script/runant.pl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- runant.pl 1 Sep 2003 10:52:43 -   1.7
  +++ runant.pl 22 Sep 2003 21:10:10 -  1.8
  @@ -39,7 +39,7 @@
   #use warnings;
   
   #and set $debug to 1 to turn on trace info
  -my $debug=0;
  +my $debug=1;
   
   ###
   #
  @@ -74,26 +74,7 @@
   }
   
   #build up standard classp

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-12 Thread conor 
conor   2003/09/12 07:01:39

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Old entry point is deprecated
  
  Revision  ChangesPath
  1.94  +2 -0  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -w -u -r1.93 -r1.94
  --- Main.java 3 Sep 2003 14:19:07 -   1.93
  +++ Main.java 12 Sep 2003 14:01:39 -  1.94
  @@ -282,6 +282,8 @@
*
* @exception BuildException if the specified build file doesn't exist
*   or is a directory.
  + *
  + * @deprecated
*/
   protected Main(String[] args) throws BuildException {
   processArgs(args);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-04 Thread Jan . Materne 
> bodewig: could you please also update docs/manual/running.html?
 
will do that

> What about a -H for -projecthelp??? Sounds more explicit... --DD

That´s why I started the discussion before changing the code.
I don´t think that that would be useful. Until now -D is the only
upper case option. And I think that is something special - java uses
that option for the same function.


Jan



> > -Original Message-
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> >
> >   Modified:src/main/org/apache/tools/ant Main.java
> >   Log:
> >   New shortcuts for ant options:
> >   -d  -->  -debug
> >   -e  -->  -emacs
> >   -h  -->  -help
> >   -p  -->  -projecthelp
> >   -s  -->  -find

RE: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-03 Thread Dominique Devienne 
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
>
>   Modified:src/main/org/apache/tools/ant Main.java
>   Log:
>   New shortcuts for ant options:
>   -d  -->  -debug
>   -e  -->  -emacs
>   -h  -->  -help
>   -p  -->  -projecthelp
>   -s  -->  -find

What about a -H for -projecthelp??? Sounds more explicit... --DD

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-03 Thread Stefan Bodewig 
could you please also update docs/manual/running.html?

Thanks

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-09-03 Thread jhm 
jhm 2003/09/03 07:19:07

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  New shortcuts for ant options:
  -d  -->  -debug
  -e  -->  -emacs
  -h  -->  -help
  -p  -->  -projecthelp
  -s  -->  -find
  
  Revision  ChangesPath
  1.93  +12 -12ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Main.java 27 Aug 2003 08:45:03 -  1.92
  +++ Main.java 3 Sep 2003 14:19:07 -   1.93
  @@ -303,7 +303,7 @@
   for (int i = 0; i < args.length; i++) {
   String arg = args[i];
   
  -if (arg.equals("-help")) {
  +if (arg.equals("-help") || arg.equals("-h")) {
   printUsage();
   return;
   } else if (arg.equals("-version")) {
  @@ -317,7 +317,7 @@
   } else if (arg.equals("-verbose") || arg.equals("-v")) {
   printVersion();
   msgOutputLevel = Project.MSG_VERBOSE;
  -} else if (arg.equals("-debug")) {
  +} else if (arg.equals("-debug") || arg.equals("-d")) {
   printVersion();
   msgOutputLevel = Project.MSG_DEBUG;
   } else if (arg.equals("-noinput")) {
  @@ -407,12 +407,12 @@
+ " using the -inputhandler"
+ " argument");
   }
  -} else if (arg.equals("-emacs")) {
  +} else if (arg.equals("-emacs") || arg.equals("-e")) {
   emacsMode = true;
  -} else if (arg.equals("-projecthelp")) {
  +} else if (arg.equals("-projecthelp") || arg.equals("-p")) {
   // set the flag to display the targets and quit
   projectHelp = true;
  -} else if (arg.equals("-find")) {
  +} else if (arg.equals("-find") || arg.equals("-s")) {
   // eat up next arg if present, default to build.xml
   if (i < args.length - 1) {
   searchForThis = args[++i];
  @@ -796,15 +796,15 @@
   StringBuffer msg = new StringBuffer();
   msg.append("ant [options] [target [target2 [target3] ...]]" + lSep);
   msg.append("Options: " + lSep);
  -msg.append("  -help  print this message" + lSep);
  -msg.append("  -projecthelp   print project help information" 
+ lSep);
  +msg.append("  -help, -h  print this message" + lSep);
  +msg.append("  -projecthelp, -p   print project help information" 
+ lSep);
   msg.append("  -version   print the version information 
and exit" + lSep);
   msg.append("  -diagnostics   print information that might be 
helpful to" + lSep);
   msg.append(" diagnose or report problems." + 
lSep);
   msg.append("  -quiet, -q be extra quiet" + lSep);
   msg.append("  -verbose, -v   be extra verbose" + lSep);
  -msg.append("  -debug print debugging information" + 
lSep);
  -msg.append("  -emacs produce logging information 
without adornments" + lSep);
  +msg.append("  -debug, -d print debugging information" + 
lSep);
  +msg.append("  -emacs, -e produce logging information 
without adornments" + lSep);
   msg.append("  -logfile use given file for log" + lSep);
   msg.append("-l ''" + lSep);
   msg.append("  -logger the class which is to perform 
logging" + lSep);
  @@ -819,8 +819,8 @@
   msg.append("  -propertyfileload all properties from file 
with -D" + lSep);
   msg.append(" properties taking precedence" + 
lSep);
   msg.append("  -inputhandler   the class which will handle 
input requests" + lSep);
  -msg.append("  -findsearch for buildfile towards 
the root of the" + lSep);
  -msg.append(" filesystem and use it" + lSep);
  +msg.append("  -find(s)earch for buildfile towards 
the root of" + lSep);
  +msg.append("-s the filesystem and use it" + 
lSep);
   System.out.println(msg.toString());
   }
   
  @@ -1010,4 +1010,4 @@
   }
   project.log(msg.toString());
   }
  -}
  +}
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-08-27 Thread bodewig 
bodewig 2003/08/27 01:45:04

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Improve symmetry
  
  Revision  ChangesPath
  1.92  +1 -1  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- Main.java 5 Aug 2003 15:40:56 -   1.91
  +++ Main.java 27 Aug 2003 08:45:03 -  1.92
  @@ -509,7 +509,7 @@
   out = logTo;
   err = logTo;
   System.setOut(out);
  -System.setErr(out);
  +System.setErr(err);
   }
   readyToRun = true;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-08-05 Thread bodewig 
bodewig 2003/08/05 08:40:56

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  ant -Debug would cause a NullPointerException
  
  PR: 22065
  
  Revision  ChangesPath
  1.91  +3 -0  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- Main.java 4 Aug 2003 12:23:26 -   1.90
  +++ Main.java 5 Aug 2003 15:40:56 -   1.91
  @@ -378,6 +378,9 @@
   name = name.substring(0, posEq);
   } else if (i < args.length - 1) {
   value = args[++i];
  +} else {
  +throw new BuildException("Missing value for property "
  + + name);
   }
   
   definedProps.put(name, value);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-08-04 Thread bodewig 
bodewig 2003/08/04 05:23:26

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Restore System.in, PR: 22066
  
  Revision  ChangesPath
  1.90  +2 -0  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Main.java 18 Jul 2003 12:45:54 -  1.89
  +++ Main.java 4 Aug 2003 12:23:26 -   1.90
  @@ -603,6 +603,7 @@
   
   PrintStream err = System.err;
   PrintStream out = System.out;
  +InputStream in = System.in;
   
   // use a system manager that prevents from System.exit()
   // only in JDK > 1.1
  @@ -668,6 +669,7 @@
   
   System.setOut(out);
   System.setErr(err);
  +System.setIn(in);
   }
   } catch (RuntimeException exc) {
   error = exc;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/main/org/apache/tools/ant Main.java

2003-07-14 Thread conor 
conor   2003/07/13 19:53:52

  Modified:src/main/org/apache/tools/ant Main.java
  Log:
  Subtargets is a little confusing - change to "Other Targets"
  
  PR:   14866
  
  Revision  ChangesPath
  1.86  +2 -2  ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -w -u -r1.85 -r1.86
  --- Main.java 6 Jul 2003 09:57:34 -   1.85
  +++ Main.java 14 Jul 2003 02:53:52 -  1.86
  @@ -357,7 +357,7 @@
   } else if (arg.startsWith("-D")) {
   
   /* Interestingly enough, we get to here when a user
  - * uses -Dname=value. However, in some cases, the JDK
  + * uses -Dname=value. However, in some cases, the OS
* goes ahead and parses this out to args
*   {"-Dname", "value"}
* so instead of parsing on "=", we just make the "-D"
  @@ -921,7 +921,7 @@
   printSubTargets = true;
   }
   if (printSubTargets) {
  -printTargets(project, subNames, null, "Subtargets:", 0);
  +printTargets(project, subNames, null, "Other targets:", 0);
   }
   
   String defaultTarget = project.getDefaultTarget();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]