src/Tools/jEdit/lib/Tools/jedit
changeset 49566 66cbf8bb4693
parent 49494 cbcccf2a0f6f
child 49570 2265456f6131
     1.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Tue Sep 25 20:28:47 2012 +0200
     1.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Sep 25 22:36:06 2012 +0200
     1.3 @@ -12,6 +12,7 @@
     1.4    "src/document_model.scala"
     1.5    "src/document_view.scala"
     1.6    "src/html_panel.scala"
     1.7 +  "src/graph_dockable.scala"
     1.8    "src/hyperlink.scala"
     1.9    "src/isabelle_encoding.scala"
    1.10    "src/isabelle_logic.scala"
    1.11 @@ -89,6 +90,7 @@
    1.12  
    1.13  BUILD_ONLY=false
    1.14  BUILD_JARS="jars"
    1.15 +FRESH_OPTION=""
    1.16  JEDIT_SESSION_DIRS=""
    1.17  JEDIT_LOGIC="$ISABELLE_LOGIC"
    1.18  JEDIT_PRINT_MODE=""
    1.19 @@ -113,6 +115,7 @@
    1.20          fi
    1.21          ;;
    1.22        f)
    1.23 +        FRESH_OPTION="-f"
    1.24          BUILD_JARS="jars_fresh"
    1.25          ;;
    1.26        j)
    1.27 @@ -162,9 +165,13 @@
    1.28  ## dependencies
    1.29  
    1.30  [ -e "$ISABELLE_HOME/Admin/build" ] && \
    1.31 -  { "$ISABELLE_HOME/Admin/build" "$BUILD_JARS" || exit $?; }
    1.32 +  {
    1.33 +    "$ISABELLE_HOME/Admin/build" "$BUILD_JARS" || exit $?
    1.34 +    "$ISABELLE_TOOL" graphview -b $FRESH_OPTION || exit $?
    1.35 +  }
    1.36  
    1.37  PURE_JAR="$ISABELLE_HOME/lib/classes/ext/Pure.jar"
    1.38 +GRAPHVIEW_JAR="$ISABELLE_HOME/lib/classes/ext/Graphview.jar"
    1.39  
    1.40  pushd "$JEDIT_HOME" >/dev/null || failed
    1.41  
    1.42 @@ -193,9 +200,12 @@
    1.43      OUTDATED=true
    1.44    else
    1.45      if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
    1.46 -      declare -a DEPS=("$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
    1.47 +      declare -a DEPS=(
    1.48 +        "$JEDIT_JAR" "${JEDIT_JARS[@]}"
    1.49 +        "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}"
    1.50 +      )
    1.51      elif [ -e "$ISABELLE_HOME/Admin/build" ]; then
    1.52 -      declare -a DEPS=("$PURE_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
    1.53 +      declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
    1.54      else
    1.55        declare -a DEPS=()
    1.56      fi
    1.57 @@ -247,7 +257,8 @@
    1.58  
    1.59    cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
    1.60    (
    1.61 -    for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
    1.62 +    for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "$GRAPHVIEW_JAR" \
    1.63 +      "$SCALA_HOME/lib/scala-compiler.jar"
    1.64      do
    1.65        CLASSPATH="$CLASSPATH:$JAR"
    1.66      done