ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@locus.apache.org
Subject cvs commit: jakarta-ant bootstrap.sh
Date Wed, 13 Dec 2000 09:34:12 GMT
bodewig     00/12/13 01:34:11

  Modified:    .        bootstrap.sh
  Log:
  Make sure JAVA_HOME/bin/java is executable as well. Only use a single
  ${JAVAC} command to compile all needed classes in one pass.
  
  Revision  Changes    Path
  1.30      +7 -6      jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- bootstrap.sh	2000/12/13 05:20:08	1.29
  +++ bootstrap.sh	2000/12/13 09:34:10	1.30
  @@ -23,6 +23,12 @@
     exit
   fi
   
  +if [ ! -x "$JAVA_HOME/bin/java" ] ; then
  +  echo "Error: JAVA_HOME is not defined correctly."
  +  echo "  We cannot execute JAVA_HOME/bin/java"
  +  exit
  +fi
  +
   # More Cygwin support
   if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  @@ -77,12 +83,7 @@
   
   echo ... Compiling Ant Classes
   
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/util/regexp/RegexpMatcher.java ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/util/*.java
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/types/*.java
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/*.java
  -${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
  +${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java ${TOOLS}/ant/util/regexp/RegexpMatcher.java
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java
${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java
   
   echo ... Copying Required Files
   
  
  
  

Mime
View raw message