diff -up scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl.tooltemplate scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl --- scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl.tooltemplate 2010-08-15 02:18:09.365756959 -0600 +++ scala-2.8.0.final-sources/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2010-08-15 02:21:16.517801279 -0600 @@ -8,35 +8,13 @@ # PARTICULAR PURPOSE. ############################################################################## -cygwin=false; -case "`uname`" in - CYGWIN*) cygwin=true ;; -esac - -# Finding the root folder for this Scala distribution -SOURCE=$0; -SCRIPT=`basename "$SOURCE"`; -while [ -h "$SOURCE" ]; do - SCRIPT=`basename "$SOURCE"`; - LOOKUP=`ls -ld "$SOURCE"`; - TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; - if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then - SOURCE=${TARGET:-.}; - else - SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; - fi; -done; - -# see #2092 -SCALA_HOME=`dirname "$SOURCE"` -SCALA_HOME=`cd "$SCALA_HOME"; pwd -P` -SCALA_HOME=`cd "$SCALA_HOME"/..; pwd` - -# Remove spaces from SCALA_HOME on windows -if $cygwin; then - SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` - SCALA_HOME=`cygpath --unix "$SCALA_HOME"` -fi +[ -r @@JAVADIR@@-utils/java-functions ] && . @@JAVADIR@@-utils/java-functions || exit 1 + +set_javacmd || exit 3 +check_java_env || exit 4 +set_jvm_dirs || exit 5 + +SCALA_HOME="@@DATADIR@@/scala" # Constructing the extension classpath TOOL_CLASSPATH="@classpath@" @@ -50,16 +28,6 @@ if [ -z "$TOOL_CLASSPATH" ] ; then done fi -if $cygwin; then - if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then - format=mixed - else - format=windows - fi - SCALA_HOME=`cygpath --$format "$SCALA_HOME"` - TOOL_CLASSPATH=`cygpath --path --$format "$TOOL_CLASSPATH"` -fi - # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris [ -n "$JAVA_OPTS" ] || JAVA_OPTS="@javaflags@" @@ -75,9 +43,4 @@ do esac done - -if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then - JAVACMD="$JAVA_HOME/bin/java" -fi - -exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" +exec "${JAVACMD}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@"