@@ -65,9 +65,9 @@ if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
JAVACMD=" $JAVA_HOME/jre/sh/java"
else
else
JAVACMD=$JAVA_HOME/bin/java
JAVACMD=" $JAVA_HOME/bin/java"
fi
fi
else
else
JAVACMD=java
JAVACMD=java
@@ -81,7 +81,7 @@ if [ ! -x "$JAVACMD" ] ; then
fi
fi
if [ -n "$CLASSPATH" ] ; then
if [ -n "$CLASSPATH" ] ; then
LOCALCLASSPATH=$CLASSPATH
LOCALCLASSPATH=" $CLASSPATH"
fi
fi
# add in the dependency .jar files
# add in the dependency .jar files
@@ -94,18 +94,18 @@ do
if [ -z "$LOCALCLASSPATH" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
LOCALCLASSPATH=$i
LOCALCLASSPATH=$i
else
else
LOCALCLASSPATH="$i":$LOCALCLASSPATH
LOCALCLASSPATH="$i":" $LOCALCLASSPATH"
fi
fi
fi
fi
done
done
if [ -n "$JAVA_HOME" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
LOCALCLASSPATH=" $LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
fi
fi
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
LOCALCLASSPATH=" $LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
fi
fi
# OSX hack to make Ant work with jikes
# OSX hack to make Ant work with jikes
@@ -143,4 +143,4 @@ if $cygwin; then
LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
fi
fi
$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
" $JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"