1.1 --- a/bin/isabelle-interface Sat Oct 04 16:05:15 2008 +0200
1.2 +++ b/bin/isabelle-interface Sat Oct 04 16:19:00 2008 +0200
1.3 @@ -32,7 +32,7 @@
1.4
1.5 case "$ISABELLE_INTERFACE" in
1.6 none)
1.7 - INTERFACE="$ISABELLE"
1.8 + INTERFACE="$ISABELLE_PROCESS"
1.9 ;;
1.10 */*)
1.11 INTERFACE="$ISABELLE_INTERFACE"
2.1 --- a/doc-src/System/Thy/Basics.thy Sat Oct 04 16:05:15 2008 +0200
2.2 +++ b/doc-src/System/Thy/Basics.thy Sat Oct 04 16:19:00 2008 +0200
2.3 @@ -126,7 +126,7 @@
2.4
2.5 \begin{itemize}
2.6
2.7 - \item @{setting_def ISABELLE} and @{setting_def ISABELLE_TOOL} are set
2.8 + \item @{setting_def ISABELLE_PROCESS} and @{setting_def ISABELLE_TOOL} are set
2.9 automatically to the absolute path names of the @{executable
2.10 "isabelle-process"} and @{executable isatool} executables,
2.11 respectively.
2.12 @@ -168,7 +168,7 @@
2.13 some extend. In particular, site-wide defaults may be overridden by
2.14 a private @{verbatim "$ISABELLE_HOME_USER/etc/settings"}.
2.15
2.16 - \item[@{setting_def ISABELLE}@{text "\<^sup>*"}, @{setting
2.17 + \item[@{setting_def ISABELLE_PROCESS}@{text "\<^sup>*"}, @{setting
2.18 ISABELLE_TOOL}@{text "\<^sup>*"}] are automatically set to the full path
2.19 names of the @{executable "isabelle-process"} and @{executable
2.20 isatool} executables, respectively. Thus other tools and scripts
3.1 --- a/lib/Tools/codegen Sat Oct 04 16:05:15 2008 +0200
3.2 +++ b/lib/Tools/codegen Sat Oct 04 16:19:00 2008 +0200
3.3 @@ -37,4 +37,4 @@
3.4 CMD=$(echo $CMD | sed -e 's/\\/\\\\"/g; s/"/\\\"/g')
3.5 FULL_CMD="Code_Target.shell_command \"$THY\" \"$CMD\";"
3.6
3.7 -"$ISABELLE" -q -e "$FULL_CMD" "$IMAGE" || exit 1
3.8 +"$ISABELLE_PROCESS" -q -e "$FULL_CMD" "$IMAGE" || exit 1
4.1 --- a/lib/Tools/tty Sat Oct 04 16:05:15 2008 +0200
4.2 +++ b/lib/Tools/tty Sat Oct 04 16:19:00 2008 +0200
4.3 @@ -67,7 +67,7 @@
4.4 ## main
4.5
4.6 if [ -n "$LINE_EDITOR" ]; then
4.7 - exec "$LINE_EDITOR" "$ISABELLE" $ISABELLE_OPTIONS "$LOGIC"
4.8 + exec "$LINE_EDITOR" "$ISABELLE_PROCESS" $ISABELLE_OPTIONS "$LOGIC"
4.9 else
4.10 - exec "$ISABELLE" $ISABELLE_OPTIONS "$LOGIC"
4.11 + exec "$ISABELLE_PROCESS" $ISABELLE_OPTIONS "$LOGIC"
4.12 fi
5.1 --- a/lib/Tools/usedir Sat Oct 04 16:05:15 2008 +0200
5.2 +++ b/lib/Tools/usedir Sat Oct 04 16:19:00 2008 +0200
5.3 @@ -227,7 +227,7 @@
5.4 OPT_C=""
5.5 [ "$COMPRESS" = true ] && OPT_C="-c"
5.6
5.7 - "$ISABELLE" \
5.8 + "$ISABELLE_PROCESS" \
5.9 -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;" \
5.10 $OPT_C -q -w $LOGIC $NAME > "$LOG"
5.11 RC="$?"
5.12 @@ -236,7 +236,7 @@
5.13 echo "Running $ITEM ..." >&2
5.14 LOG="$LOGDIR/$ITEM"
5.15
5.16 - "$ISABELLE" \
5.17 + "$ISABELLE_PROCESS" \
5.18 -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();" \
5.19 -r -q "$LOGIC" > "$LOG"
5.20 RC="$?"
6.1 --- a/src/Pure/mk Sat Oct 04 16:05:15 2008 +0200
6.2 +++ b/src/Pure/mk Sat Oct 04 16:19:00 2008 +0200
6.3 @@ -88,7 +88,7 @@
6.4 echo "Building $ITEM ..."
6.5 LOG="$LOGDIR/$ITEM"
6.6
6.7 - "$ISABELLE" \
6.8 + "$ISABELLE_PROCESS" \
6.9 -e "val ml_system = \"$ML_SYSTEM\";" \
6.10 -e "val ml_platform = \"$ML_PLATFORM\";" \
6.11 -e "use\"$COMPAT\" handle _ => exit 1;" \
6.12 @@ -99,7 +99,7 @@
6.13 echo "Running $ITEM ..."
6.14 LOG="$LOGDIR/$ITEM"
6.15
6.16 - "$ISABELLE" \
6.17 + "$ISABELLE_PROCESS" \
6.18 -e "use\"$RAW_SESSION\" handle _ => exit 1;" \
6.19 -q RAW > "$LOG" 2>&1
6.20 RC="$?"
6.21 @@ -108,7 +108,7 @@
6.22 echo "Building $ITEM ..."
6.23 LOG="$LOGDIR/$ITEM"
6.24
6.25 - "$ISABELLE" \
6.26 + "$ISABELLE_PROCESS" \
6.27 -e "val ml_system = \"$ML_SYSTEM\";" \
6.28 -e "val ml_platform = \"$ML_PLATFORM\";" \
6.29 -e "(use\"$COMPAT\"; use\"ROOT.ML\") handle _ => exit 1;" \