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/script ant
Date Fri, 09 Aug 2002 13:57:50 GMT
bodewig     2002/08/09 06:57:50

  Modified:    src/script ant
  Log:
  Only set jikes.class.path if JIKESPATH is defined.
  
  Submitted by:	Patrick Luby <patrick.luby@sun.com>
  
  Revision  Changes    Path
  1.26      +15 -12    jakarta-ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/ant,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ant	9 Aug 2002 07:57:05 -0000	1.25
  +++ ant	9 Aug 2002 13:57:50 -0000	1.26
  @@ -46,7 +46,6 @@
     ## resolve links - $0 may be a link to ant's home
     PRG="$0"
     progname=`basename "$0"`
  -  saveddir=`pwd`
   
     # need this for relative symlinks
     while [ -h "$PRG" ] ; do
  @@ -64,7 +63,6 @@
     # make it fully qualified
     ANT_HOME=`cd "$ANT_HOME" && pwd`
   
  -  cd "$saveddir"
   fi
   
   # For Cygwin, ensure paths are in UNIX format before anything is touched
  @@ -160,13 +158,6 @@
     echo "  to the installation directory of java."
   fi
   
  -# supply JIKESPATH to Ant as jikes.class.path
  -if [ -n "$JIKESPATH" ] ; then
  -  if $cygwin ; then
  -    JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
  -  fi
  -fi
  -
   # Allow Jikes support (off by default)
   if $usejikes; then
     ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
  @@ -179,7 +170,19 @@
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
     CYGHOME=`cygpath --path --windows "$HOME"`
  -  exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
$ANT_OPTS -Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.Main $ANT_ARGS "$@"
  +fi
  +
  +if [ -n "$CYGHOME" ]; then
  +  if [ -n "$JIKESPATH" ]; then
  +    JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
  +    exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
-Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
  +  else
  +    exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME"
$ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
  +  fi
   else
  -  exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
$ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
  -fi
  \ No newline at end of file
  +  if [ -n "$JIKESPATH" ]; then
  +    exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
$ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
  +  else
  +    exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main
$ANT_ARGS "$@"
  +  fi
  +fi
  
  
  

--
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