# HG changeset patch
# User wenzelm
# Date 1246204544 -7200
# Node ID 92993da74973224dafafc38197279b77b8988fb0
# Parent  4c721440ee620dad9447ebc7046e9c12680aa761
clarified "jars" target;

diff -r 4c721440ee62 -r 92993da74973 Admin/build
--- a/Admin/build	Sun Jun 28 17:42:22 2009 +0200
+++ b/Admin/build	Sun Jun 28 17:55:44 2009 +0200
@@ -8,6 +8,9 @@
 PATH="/usr/local/dist/DIR/j2sdk1.5.0/bin:$PATH"
 
 PATH="/home/scala/current/bin:$PATH"
+if [ -z "$SCALA_HOME" ]; then
+  export SCALA_HOME="$(dirname "$(dirname "$(type -p scalac)")")"
+fi
 
 
 ## directory layout
@@ -32,7 +35,7 @@
     all             all modules below
     browser         graph browser (requires jdk)
     doc             documentation (requires latex and rail)
-    jars            JVM components (requires jdk and scala)
+    jars            Scala/JVM components (requires scala)
 
 EOF
   exit 1
@@ -93,13 +96,13 @@
 function build_jars ()
 {
   echo "###"
-  echo "### Building JVM components ..."
+  echo "### Building Scala/JVM components ..."
   echo "###"
 
-  type -p scalac >/dev/null || fail "Scala compiler unavailable"
+  [ -z "$SCALA_HOME" ] && fail "Scala unavailable: unknown SCALA_HOME"
 
   pushd "$ISABELLE_HOME/src/Pure" >/dev/null
-  "$ISABELLE_TOOL" make jar || fail "Failed to build Pure.jar!"
+  "$ISABELLE_TOOL" make jars || fail "Failed to build isabelle-scala.jar"
   popd >/dev/null
 }
 
diff -r 4c721440ee62 -r 92993da74973 src/Pure/IsaMakefile
--- a/src/Pure/IsaMakefile	Sun Jun 28 17:42:22 2009 +0200
+++ b/src/Pure/IsaMakefile	Sun Jun 28 17:55:44 2009 +0200
@@ -130,19 +130,19 @@
 SCALA_TARGET = $(ISABELLE_HOME)/lib/classes/Pure.jar
 ISABELLE_SCALA = $(ISABELLE_HOME)/lib/classes/isabelle-scala.jar
 
-jar: $(SCALA_TARGET)
+jars: $(SCALA_TARGET)
 
 $(SCALA_TARGET): $(SCALA_FILES)
 	@rm -rf classes && mkdir classes
-	scalac -deprecation -d classes -target jvm-1.5 $(SCALA_FILES)
-	scaladoc -d classes $(SCALA_FILES)
+	$(SCALA_HOME)/bin/scalac -deprecation -d classes -target jvm-1.5 $(SCALA_FILES)
+	$(SCALA_HOME)/bin/scaladoc -d classes $(SCALA_FILES)
 	@cp $(SCALA_FILES) classes/isabelle
 	@mkdir -p `dirname $@`
-	cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle
-	cd classes; jar xf `jvmpath $(SCALA_HOME)/lib/scala-swing.jar`; \
+	@cd classes; jar cfe `jvmpath $@` isabelle.GUI_Setup isabelle
+	@cd classes; jar xf `jvmpath $(SCALA_HOME)/lib/scala-swing.jar`; \
           cp $(SCALA_HOME)/lib/scala-library.jar $(ISABELLE_SCALA); \
           jar ufe `jvmpath $(ISABELLE_SCALA)` isabelle.GUI_Setup isabelle scala
 	@rm -rf classes
 
-clean-jar:
+clean-jars:
 	@rm -f $(SCALA_TARGET) $(ISABELLE_SCALA)