# HG changeset patch
# User wenzelm
# Date 1275072083 -7200
# Node ID 6feaab4fc27d5edcdd2d5f04d2bfbd573c6b9400
# Parent  ece850d911a5a2c1bb86e2f56629e2d478d961a4
assume given SCALA_HOME, e.g. from component settings or external setup;

diff -r ece850d911a5 -r 6feaab4fc27d etc/settings
--- a/etc/settings	Fri May 28 18:15:53 2010 +0200
+++ b/etc/settings	Fri May 28 20:41:23 2010 +0200
@@ -56,14 +56,6 @@
 ###
 
 ISABELLE_JAVA="java"
-ISABELLE_SCALA="scala"
-
-[ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
-  "$ISABELLE_HOME/contrib/scala" \
-  "$ISABELLE_HOME/../scala" \
-  "")
-
-[ -n "$SCALA_HOME" ] && ISABELLE_SCALA="$SCALA_HOME/bin/scala"
 
 classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
 
diff -r ece850d911a5 -r 6feaab4fc27d lib/Tools/scala
--- a/lib/Tools/scala	Fri May 28 18:15:53 2010 +0200
+++ b/lib/Tools/scala	Fri May 28 20:41:23 2010 +0200
@@ -4,7 +4,9 @@
 #
 # DESCRIPTION: invoke Scala within the Isabelle environment
 
+[ -z "$SCALA_HOME" ] && { echo "Unknown SCALA_HOME -- Scala unavailable"; exit 2; }
+
 [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
-exec "$ISABELLE_SCALA" "$@"
+exec "$SCALA_HOME/bin/scala" "$@"
diff -r ece850d911a5 -r 6feaab4fc27d src/Pure/build-jars
--- a/src/Pure/build-jars	Fri May 28 18:15:53 2010 +0200
+++ b/src/Pure/build-jars	Fri May 28 20:41:23 2010 +0200
@@ -16,7 +16,7 @@
 }
 
 [ -n "$ISABELLE_HOME" ] || fail "Missing Isabelle settings environment"
-[ -z "$SCALA_HOME" ] && fail "Scala unavailable: unknown SCALA_HOME"
+[ -z "$SCALA_HOME" ] && fail "Unknown SCALA_HOME -- Scala unavailable"
 
 
 ## dependencies