From 2ccf9c4224691fa4b6f187bc8463c0e4b8ae7daf Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 9 Aug 2002 13:57:50 +0000
Subject: [PATCH] Only set jikes.class.path if JIKESPATH is defined.

Submitted by:	Patrick Luby <patrick.luby@sun.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273210 13f79535-47bb-0310-9956-ffa450edef68
---
 src/script/ant | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/script/ant b/src/script/ant
index 1e8bd1488..2fd04852f 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -46,7 +46,6 @@ if [ -z "$ANT_HOME" ] ; then
   ## 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 @@ if [ -z "$ANT_HOME" ] ; then
   # 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 @@ else
   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 @@ if $cygwin; then
   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