# HG changeset patch # User wenzelm # Date 1223129940 -7200 # Node ID 6b0e3e4e189165feb53c45d986d6f1c1febb8e14 # Parent 4a6c9881adc0e09bb0c5101ff5e45972aec3fe14 replaced ISABELLE by ISABELLE_PROCESS; diff -r 4a6c9881adc0 -r 6b0e3e4e1891 bin/isabelle-interface --- a/bin/isabelle-interface Sat Oct 04 16:05:15 2008 +0200 +++ b/bin/isabelle-interface Sat Oct 04 16:19:00 2008 +0200 @@ -32,7 +32,7 @@ case "$ISABELLE_INTERFACE" in none) - INTERFACE="$ISABELLE" + INTERFACE="$ISABELLE_PROCESS" ;; */*) INTERFACE="$ISABELLE_INTERFACE" diff -r 4a6c9881adc0 -r 6b0e3e4e1891 doc-src/System/Thy/Basics.thy --- a/doc-src/System/Thy/Basics.thy Sat Oct 04 16:05:15 2008 +0200 +++ b/doc-src/System/Thy/Basics.thy Sat Oct 04 16:19:00 2008 +0200 @@ -126,7 +126,7 @@ \begin{itemize} - \item @{setting_def ISABELLE} and @{setting_def ISABELLE_TOOL} are set + \item @{setting_def ISABELLE_PROCESS} and @{setting_def ISABELLE_TOOL} are set automatically to the absolute path names of the @{executable "isabelle-process"} and @{executable isatool} executables, respectively. @@ -168,7 +168,7 @@ some extend. In particular, site-wide defaults may be overridden by a private @{verbatim "$ISABELLE_HOME_USER/etc/settings"}. - \item[@{setting_def ISABELLE}@{text "\<^sup>*"}, @{setting + \item[@{setting_def ISABELLE_PROCESS}@{text "\<^sup>*"}, @{setting ISABELLE_TOOL}@{text "\<^sup>*"}] are automatically set to the full path names of the @{executable "isabelle-process"} and @{executable isatool} executables, respectively. Thus other tools and scripts diff -r 4a6c9881adc0 -r 6b0e3e4e1891 lib/Tools/codegen --- a/lib/Tools/codegen Sat Oct 04 16:05:15 2008 +0200 +++ b/lib/Tools/codegen Sat Oct 04 16:19:00 2008 +0200 @@ -37,4 +37,4 @@ CMD=$(echo $CMD | sed -e 's/\\/\\\\"/g; s/"/\\\"/g') FULL_CMD="Code_Target.shell_command \"$THY\" \"$CMD\";" -"$ISABELLE" -q -e "$FULL_CMD" "$IMAGE" || exit 1 +"$ISABELLE_PROCESS" -q -e "$FULL_CMD" "$IMAGE" || exit 1 diff -r 4a6c9881adc0 -r 6b0e3e4e1891 lib/Tools/tty --- a/lib/Tools/tty Sat Oct 04 16:05:15 2008 +0200 +++ b/lib/Tools/tty Sat Oct 04 16:19:00 2008 +0200 @@ -67,7 +67,7 @@ ## main if [ -n "$LINE_EDITOR" ]; then - exec "$LINE_EDITOR" "$ISABELLE" $ISABELLE_OPTIONS "$LOGIC" + exec "$LINE_EDITOR" "$ISABELLE_PROCESS" $ISABELLE_OPTIONS "$LOGIC" else - exec "$ISABELLE" $ISABELLE_OPTIONS "$LOGIC" + exec "$ISABELLE_PROCESS" $ISABELLE_OPTIONS "$LOGIC" fi diff -r 4a6c9881adc0 -r 6b0e3e4e1891 lib/Tools/usedir --- a/lib/Tools/usedir Sat Oct 04 16:05:15 2008 +0200 +++ b/lib/Tools/usedir Sat Oct 04 16:19:00 2008 +0200 @@ -227,7 +227,7 @@ OPT_C="" [ "$COMPRESS" = true ] && OPT_C="-c" - "$ISABELLE" \ + "$ISABELLE_PROCESS" \ -e "Session.use_dir \"$ROOT_FILE\" true [$MODES] $RESET $INFO \"$DOC\" $DOCUMENT_GRAPH [$DOCUMENT_VERSIONS] \"$PARENT\" \"$SESSION\" ($COPY_DUMP, \"$DUMP\") \"$RPATH\" $PROOFS $VERBOSE $MAXTHREADS $TRACETHREADS;" \ $OPT_C -q -w $LOGIC $NAME > "$LOG" RC="$?" @@ -236,7 +236,7 @@ echo "Running $ITEM ..." >&2 LOG="$LOGDIR/$ITEM" - "$ISABELLE" \ + "$ISABELLE_PROCESS" \ -e "Session.use_dir \"$ROOT_FILE\" false [$MODES] $RESET $INFO \"$DOC\" $DOCUMENT_GRAPH [$DOCUMENT_VERSIONS] \"$PARENT\" \"$SESSION\" ($COPY_DUMP, \"$DUMP\") \"$RPATH\" $PROOFS $VERBOSE $MAXTHREADS $TRACETHREADS; quit();" \ -r -q "$LOGIC" > "$LOG" RC="$?" diff -r 4a6c9881adc0 -r 6b0e3e4e1891 src/Pure/mk --- a/src/Pure/mk Sat Oct 04 16:05:15 2008 +0200 +++ b/src/Pure/mk Sat Oct 04 16:19:00 2008 +0200 @@ -88,7 +88,7 @@ echo "Building $ITEM ..." LOG="$LOGDIR/$ITEM" - "$ISABELLE" \ + "$ISABELLE_PROCESS" \ -e "val ml_system = \"$ML_SYSTEM\";" \ -e "val ml_platform = \"$ML_PLATFORM\";" \ -e "use\"$COMPAT\" handle _ => exit 1;" \ @@ -99,7 +99,7 @@ echo "Running $ITEM ..." LOG="$LOGDIR/$ITEM" - "$ISABELLE" \ + "$ISABELLE_PROCESS" \ -e "use\"$RAW_SESSION\" handle _ => exit 1;" \ -q RAW > "$LOG" 2>&1 RC="$?" @@ -108,7 +108,7 @@ echo "Building $ITEM ..." LOG="$LOGDIR/$ITEM" - "$ISABELLE" \ + "$ISABELLE_PROCESS" \ -e "val ml_system = \"$ML_SYSTEM\";" \ -e "val ml_platform = \"$ML_PLATFORM\";" \ -e "(use\"$COMPAT\"; use\"ROOT.ML\") handle _ => exit 1;" \