tuned;

--- a/src/Pure/build-jars	Thu Jun 09 10:43:42 2011 +0200
+++ b/src/Pure/build-jars	Thu Jun 09 10:59:25 2011 +0200
@@ -6,6 +6,53 @@
 #
 # Requires proper Isabelle settings environment.
 
+## sources
+
+declare -a SOURCES=(
+  Concurrent/future.scala
+  Concurrent/simple_thread.scala
+  Concurrent/volatile.scala
+  General/exn.scala
+  General/timing.scala
+  General/linear_set.scala
+  General/markup.scala
+  General/position.scala
+  General/pretty.scala
+  General/scan.scala
+  General/sha1.scala
+  General/symbol.scala
+  General/xml.scala
+  General/xml_data.scala
+  General/yxml.scala
+  Isar/keyword.scala
+  Isar/outer_syntax.scala
+  Isar/parse.scala
+  Isar/token.scala
+  PIDE/command.scala
+  PIDE/document.scala
+  PIDE/isar_document.scala
+  PIDE/markup_tree.scala
+  PIDE/text.scala
+  System/cygwin.scala
+  System/download.scala
+  System/event_bus.scala
+  System/gui_setup.scala
+  System/isabelle_process.scala
+  System/isabelle_syntax.scala
+  System/isabelle_system.scala
+  System/platform.scala
+  System/session.scala
+  System/session_manager.scala
+  System/standard_system.scala
+  System/swing_thread.scala
+  Thy/completion.scala
+  Thy/html.scala
+  Thy/thy_header.scala
+  Thy/thy_syntax.scala
+  library.scala
+  package.scala
+)
+
 
 ## diagnostics
 
@@ -61,51 +108,6 @@
 
 ## dependencies
 
-declare -a SOURCES=(
-  Concurrent/future.scala
-  Concurrent/simple_thread.scala
-  Concurrent/volatile.scala
-  General/exn.scala
-  General/timing.scala
-  General/linear_set.scala
-  General/markup.scala
-  General/position.scala
-  General/pretty.scala
-  General/scan.scala
-  General/sha1.scala
-  General/symbol.scala
-  General/xml.scala
-  General/xml_data.scala
-  General/yxml.scala
-  Isar/keyword.scala
-  Isar/outer_syntax.scala
-  Isar/parse.scala
-  Isar/token.scala
-  PIDE/command.scala
-  PIDE/document.scala
-  PIDE/isar_document.scala
-  PIDE/markup_tree.scala
-  PIDE/text.scala
-  System/cygwin.scala
-  System/download.scala
-  System/event_bus.scala
-  System/gui_setup.scala
-  System/isabelle_process.scala
-  System/isabelle_syntax.scala
-  System/isabelle_system.scala
-  System/platform.scala
-  System/session.scala
-  System/session_manager.scala
-  System/standard_system.scala
-  System/swing_thread.scala
-  Thy/completion.scala
-  Thy/html.scala
-  Thy/thy_header.scala
-  Thy/thy_syntax.scala
-  library.scala
-  package.scala
-)
-
 TARGET_DIR="$ISABELLE_HOME/lib/classes"
 PURE_JAR="$TARGET_DIR/Pure.jar"
 FULL_JAR="$TARGET_DIR/isabelle-scala.jar"

--- a/src/Tools/jEdit/lib/Tools/jedit	Thu Jun 09 10:43:42 2011 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Thu Jun 09 10:59:25 2011 +0200
@@ -7,7 +7,7 @@
 
 ## sources
 
-declare -a SOURCE_FILES=(
+declare -a SOURCES=(
   "src/dockable.scala"
   "src/document_model.scala"
   "src/document_view.scala"
@@ -25,7 +25,7 @@
   "src/session_dockable.scala"
 )
 
-declare -a MORE_FILES=(
+declare -a RESOURCES=(
   "src/actions.xml"
   "src/dockables.xml"
   "src/Isabelle.props"
@@ -169,7 +169,7 @@
   OUTDATED=true
 else
   OUTDATED=false
-  for SOURCE in "${SOURCE_FILES[@]}" "${MORE_FILES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
+  for SOURCE in "${SOURCES[@]}" "${RESOURCES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}"
   do
     [ ! -e "$SOURCE" ] && fail "Missing file: $SOURCE"
     [ ! -e "$TARGET" -o "$SOURCE" -nt "$TARGET" ] && OUTDATED=true
@@ -198,7 +198,7 @@
   mkdir -p dist dist/classes || failed
 
   cp -a "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
-  cp -a "${MORE_FILES[@]}" dist/classes/.
+  cp -a "${RESOURCES[@]}" dist/classes/.
   cp src/jEdit.props dist/properties/.
   cp -a src/modes/. dist/modes/.
 
@@ -218,7 +218,7 @@
     CLASSPATH="$(jvmpath "$CLASSPATH")"
 
     exec "$SCALA_HOME/bin/scalac" -unchecked -deprecation \
-      -d dist/classes -target:jvm-1.5 "${SOURCE_FILES[@]}"
+      -d dist/classes -target:jvm-1.5 "${SOURCES[@]}"
   ) || fail "Failed to compile sources"
 
   cd dist/classes