diff --git a/lib/Tools/client b/lib/Tools/client --- a/lib/Tools/client +++ b/lib/Tools/client @@ -1,69 +1,69 @@ #!/usr/bin/env bash # # Author: Makarius # # DESCRIPTION: console interaction for Isabelle servers (with line-editor) PRG="$(basename "$0")" function usage() { echo echo "Usage: isabelle $PRG [OPTIONS]" echo echo " Options are:" echo " -n NAME explicit server name" echo " -p PORT explicit server port" echo echo " Console interaction for Isabelle servers (with line-editor)." echo exit 1 } function fail() { echo "$1" >&2 exit 2 } ## process command line # options declare -a SERVER_OPTS=(-s -c) while getopts "n:p:" OPT do case "$OPT" in n) SERVER_OPTS["${#SERVER_OPTS[@]}"]="-n" SERVER_OPTS["${#SERVER_OPTS[@]}"]="$OPTARG" ;; p) SERVER_OPTS["${#SERVER_OPTS[@]}"]="-p" SERVER_OPTS["${#SERVER_OPTS[@]}"]="$OPTARG" ;; \?) usage ;; esac done shift $(($OPTIND - 1)) # args [ "$#" -ne 0 ] && usage # main if type -p "$ISABELLE_LINE_EDITOR" > /dev/null then exec "$ISABELLE_LINE_EDITOR" isabelle server "${SERVER_OPTS[@]}" else - echo "### No line editor: \"$ISABELLE_LINE_EDITOR\"" + echo >&2 "### No line editor: \"$ISABELLE_LINE_EDITOR\"" exec isabelle server "${SERVER_OPTS[@]}" fi diff --git a/lib/Tools/console b/lib/Tools/console --- a/lib/Tools/console +++ b/lib/Tools/console @@ -1,19 +1,19 @@ #!/usr/bin/env bash # # Author: Makarius # # DESCRIPTION: raw ML process (interactive mode) isabelle_admin_build jars || exit $? eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)" mkdir -p "$ISABELLE_TMP_PREFIX" || exit $? if type -p "$ISABELLE_LINE_EDITOR" > /dev/null then exec "$ISABELLE_LINE_EDITOR" isabelle java "${JAVA_ARGS[@]}" isabelle.ML_Console "$@" else - echo "### No line editor: \"$ISABELLE_LINE_EDITOR\"" + echo >&2 "### No line editor: \"$ISABELLE_LINE_EDITOR\"" exec isabelle java "${JAVA_ARGS[@]}" isabelle.ML_Console "$@" fi diff --git a/lib/browser/build b/lib/browser/build --- a/lib/browser/build +++ b/lib/browser/build @@ -1,72 +1,72 @@ #!/usr/bin/env bash # # Author: Makarius # # mk - build graph browser # # Requires proper Isabelle settings environment. ## diagnostics function fail() { echo "$1" >&2 exit 2 } [ -n "$ISABELLE_HOME" ] || fail "Missing Isabelle settings environment" ## dependencies declare -a SOURCES=( GraphBrowser/AWTFontMetrics.java GraphBrowser/AbstractFontMetrics.java GraphBrowser/Box.java GraphBrowser/Console.java GraphBrowser/DefaultFontMetrics.java GraphBrowser/Directory.java GraphBrowser/DummyVertex.java GraphBrowser/Graph.java GraphBrowser/GraphBrowser.java GraphBrowser/GraphBrowserFrame.java GraphBrowser/GraphView.java GraphBrowser/NormalVertex.java GraphBrowser/ParseError.java GraphBrowser/Region.java GraphBrowser/Spline.java GraphBrowser/TreeBrowser.java GraphBrowser/TreeNode.java GraphBrowser/Vertex.java awtUtilities/Border.java awtUtilities/MessageDialog.java awtUtilities/TextFrame.java ) TARGET="$ISABELLE_HOME/lib/browser/GraphBrowser.jar" ## main OUTDATED=false for SOURCE in "${SOURCES[@]}" do [ ! -e "$SOURCE" ] && fail "Missing source file: $SOURCE" [ ! -e "$TARGET" -o "$SOURCE" -nt "$TARGET" ] && OUTDATED=true done if [ "$OUTDATED" = true ] then - echo "### Building graph browser ..." + echo >&2 "### Building graph browser ..." rm -rf classes && mkdir classes isabelle_jdk javac -d classes -source 1.6 "${SOURCES[@]}" || \ fail "Failed to compile sources" isabelle_jdk jar cf "$(platform_path "$TARGET")" -C classes . || fail "Failed to produce $TARGET" rm -rf classes fi