1.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Thu Jun 16 18:00:56 2011 +0200
     1.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Thu Jun 16 20:12:59 2011 +0200
     1.3 @@ -142,6 +142,11 @@
     1.4  
     1.5  ## dependencies
     1.6  
     1.7 +[ -e "$ISABELLE_HOME/Admin/build" ] && \
     1.8 +  { "$ISABELLE_HOME/Admin/build" "$BUILD_JARS" || exit $?; }
     1.9 +
    1.10 +PURE_JAR="$ISABELLE_HOME/lib/classes/Pure.jar"
    1.11 +
    1.12  pushd "$JEDIT_HOME" >/dev/null || failed
    1.13  
    1.14  JEDIT_JAR="$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/jedit.jar"
    1.15 @@ -176,9 +181,9 @@
    1.16      OUTDATED=true
    1.17    else
    1.18      if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
    1.19 -      declare -a DEPS=("${SOURCES[@]}" "${RESOURCES[@]}" "$JEDIT_JAR" "${JEDIT_JARS[@]}")
    1.20 +      declare -a DEPS=("${SOURCES[@]}" "${RESOURCES[@]}" "$PURE_JAR" "$JEDIT_JAR" "${JEDIT_JARS[@]}")
    1.21      else
    1.22 -      declare -a DEPS=("${SOURCES[@]}" "${RESOURCES[@]}")
    1.23 +      declare -a DEPS=("${SOURCES[@]}" "${RESOURCES[@]}" "$PURE_JAR")
    1.24      fi
    1.25      for DEP in "${DEPS[@]}"
    1.26      do
    1.27 @@ -196,11 +201,6 @@
    1.28  
    1.29  if [ "$OUTDATED" = true ]
    1.30  then
    1.31 -  [ -z "$SCALA_HOME" ] && fail "Unknown SCALA_HOME -- Scala unavailable"
    1.32 -
    1.33 -  [ -e "$ISABELLE_HOME/Admin/build" ] && \
    1.34 -    { "$ISABELLE_HOME/Admin/build" "$BUILD_JARS" || exit $?; }
    1.35 -
    1.36    echo "###"
    1.37    echo "### Building Isabelle/jEdit ..."
    1.38    echo "###"
    1.39 @@ -233,9 +233,7 @@
    1.40        print qq,<MODE NAME="scala" FILE="scala.xml" FILE_NAME_GLOB="*.scala" />\n\n,; }
    1.41      print; }' dist/modes/catalog
    1.42  
    1.43 -  cp -a "${JEDIT_JARS[@]}" "${SCALA_JARS[@]}" "$ISABELLE_HOME/lib/classes/Pure.jar" \
    1.44 -    dist/jars/. || failed
    1.45 -
    1.46 +  cp -a "${JEDIT_JARS[@]}" "${SCALA_JARS[@]}" "$PURE_JAR" dist/jars/. || failed
    1.47    (
    1.48      for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$SCALA_HOME/lib/scala-compiler.jar"
    1.49      do