1.1 --- a/etc/settings	Fri May 28 18:15:53 2010 +0200
     1.2 +++ b/etc/settings	Fri May 28 20:41:23 2010 +0200
     1.3 @@ -56,14 +56,6 @@
     1.4  ###
     1.5  
     1.6  ISABELLE_JAVA="java"
     1.7 -ISABELLE_SCALA="scala"
     1.8 -
     1.9 -[ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
    1.10 -  "$ISABELLE_HOME/contrib/scala" \
    1.11 -  "$ISABELLE_HOME/../scala" \
    1.12 -  "")
    1.13 -
    1.14 -[ -n "$SCALA_HOME" ] && ISABELLE_SCALA="$SCALA_HOME/bin/scala"
    1.15  
    1.16  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.17  

     2.1 --- a/lib/Tools/scala	Fri May 28 18:15:53 2010 +0200
     2.2 +++ b/lib/Tools/scala	Fri May 28 20:41:23 2010 +0200
     2.3 @@ -4,7 +4,9 @@
     2.4  #
     2.5  # DESCRIPTION: invoke Scala within the Isabelle environment
     2.6  
     2.7 +[ -z "$SCALA_HOME" ] && { echo "Unknown SCALA_HOME -- Scala unavailable"; exit 2; }
     2.8 +
     2.9  [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
    2.10  
    2.11  CLASSPATH="$(jvmpath "$CLASSPATH")"
    2.12 -exec "$ISABELLE_SCALA" "$@"
    2.13 +exec "$SCALA_HOME/bin/scala" "$@"

     3.1 --- a/src/Pure/build-jars	Fri May 28 18:15:53 2010 +0200
     3.2 +++ b/src/Pure/build-jars	Fri May 28 20:41:23 2010 +0200
     3.3 @@ -16,7 +16,7 @@
     3.4  }
     3.5  
     3.6  [ -n "$ISABELLE_HOME" ] || fail "Missing Isabelle settings environment"
     3.7 -[ -z "$SCALA_HOME" ] && fail "Scala unavailable: unknown SCALA_HOME"
     3.8 +[ -z "$SCALA_HOME" ] && fail "Unknown SCALA_HOME -- Scala unavailable"
     3.9  
    3.10  
    3.11  ## dependencies