ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/script ant
Date Sun, 02 Feb 2003 11:50:29 GMT
conor       2003/02/02 03:50:29

  Modified:    src/script Tag: ANT_15_BRANCH ant
  Log:
  Merge
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.12 +5 -2      jakarta-ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/ant,v
  retrieving revision 1.19.2.11
  retrieving revision 1.19.2.12
  diff -u -w -u -r1.19.2.11 -r1.19.2.12
  --- ant	24 Jan 2003 14:51:46 -0000	1.19.2.11
  +++ ant	2 Feb 2003 11:50:29 -0000	1.19.2.12
  @@ -91,9 +91,12 @@
         JAVACMD="$JAVA_HOME/bin/java"
       fi
     else
  +    JAVACMD=`which java 2> /dev/null `
  +    if [ -z "$JAVACMD" ] ; then 
       JAVACMD=java
     fi
   fi
  +fi
    
   if [ ! -x "$JAVACMD" ] ; then
     echo "Error: JAVA_HOME is not defined correctly."
  @@ -155,7 +158,7 @@
       fi
     fi
   else
  -  echo "Warning: JAVA_HOME environment variable is not set."
  +  echo "Warning: JAVA_HOME environment variable is not set (or not exported)."
     echo "  If build fails because sun.* classes could not be found"
     echo "  you will need to set the JAVA_HOME environment variable"
     echo "  to the installation directory of java."
  
  
  

Mime
View raw message