ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types CommandlineJava.java
Date Thu, 21 Mar 2002 08:19:07 GMT
bodewig     02/03/21 00:19:07

  Modified:    src/main/org/apache/tools/ant/taskdefs Javac.java
                        Javadoc.java
               src/main/org/apache/tools/ant/types CommandlineJava.java
  Log:
  Make detection system for java|javac|javadoc fallback to *.exe instead
  of * on dos based systems.
  
  PR: 7117
  
  Revision  Changes    Path
  1.90      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Javac.java	19 Mar 2002 22:21:34 -0000	1.89
  +++ Javac.java	21 Mar 2002 08:19:07 -0000	1.90
  @@ -103,7 +103,7 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  - * @version $Revision: 1.89 $
  + * @version $Revision: 1.90 $
    *
    * @ant.task category="java"
    */
  @@ -727,7 +727,7 @@
           if (jExecutable.exists() && !Os.isFamily("netware")) {
               return jExecutable.getAbsolutePath();
           } else {
  -            return "javac";
  +            return "javac" + extension;
           }
       }
   
  
  
  
  1.80      +4 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- Javadoc.java	11 Mar 2002 07:23:34 -0000	1.79
  +++ Javadoc.java	21 Mar 2002 08:19:07 -0000	1.80
  @@ -1367,10 +1367,11 @@
               return jdocExecutable.getAbsolutePath();
           } else {
               if (!Os.isFamily("netware")) {
  -                log( "Unable to locate " + jdocExecutable.getAbsolutePath() +
  -                     ". Using \"javadoc\" instead.", Project.MSG_VERBOSE );
  +                log( "Unable to locate " + jdocExecutable.getAbsolutePath()
  +                     + ". Using \"javadoc" + extension
  +                     + "\" instead.", Project.MSG_VERBOSE );
               }
  -            return "javadoc";
  +            return "javadoc" + extension;
           }
       }
   
  
  
  
  1.30      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CommandlineJava.java	25 Feb 2002 15:33:19 -0000	1.29
  +++ CommandlineJava.java	21 Mar 2002 08:19:07 -0000	1.30
  @@ -389,7 +389,7 @@
               // <JTULLEY@novell.com>
               return jExecutable.getAbsolutePath();
           } else {
  -            return "java";
  +            return "java" + extension;
           }
       }
       
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message