--- a/NEWS Sun Nov 30 12:58:20 2008 +0100
+++ b/NEWS Sun Nov 30 14:03:45 2008 +0100
@@ -15,17 +15,18 @@
- The former "isabelle" alias for "isabelle-process" has been
removed (should rarely occur to regular users).
- - The "Isabelle" alias for "isabelle-interface" has been removed.
+ - The former "isabelle-interface" and its alias "Isabelle" have been
+ removed (interfaces are now regular Isabelle tools).
Within scripts and make files, the Isabelle environment variables
ISABELLE_TOOL and ISABELLE_PROCESS replace old ISATOOL and ISABELLE,
respectively. (The latter are still available as legacy feature.)
-Also note that user interfaces are now better wrapped as regular
-Isabelle tools instead of using the special isabelle-interface wrapper
-(which can be confusing if the interface is uninstalled or changed
-otherwise). See "isabelle tty" and "isabelle emacs" for contemporary
-examples.
+The old isabelle-interface wrapper could react in confusing ways if
+the interface was uninstalled or changed otherwise. Individual
+interface tool configuration is now more explicit, see also the
+Isabelle system manual. In particular, Proof General is now available
+via "isabelle emacs".
INCOMPATIBILITY, need to adapt derivative scripts. Users may need to
purge installed copies of Isabelle executables and re-run "isabelle
--- a/bin/isabelle-interface Sun Nov 30 12:58:20 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-#
-# $Id$
-# Author: Markus Wenzel, TU Muenchen
-#
-# Isabelle interface startup script.
-
-if [ -L "$0" ]; then
- TARGET="$(LC_ALL=C ls -l "$0" | sed 's/.* -> //')"
- exec "$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd "$(dirname "$TARGET")"; pwd)/$(basename "$TARGET")" "$@"
-fi
-
-
-## settings
-
-PRG="$(basename "$0")"
-
-ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
-source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
-
-
-## diagnostics
-
-function fail()
-{
- echo "$1" >&2
- exit 2
-}
-
-
-## main
-
-case "$ISABELLE_INTERFACE" in
- none)
- INTERFACE="$ISABELLE_PROCESS"
- ;;
- */*)
- INTERFACE="$ISABELLE_INTERFACE"
- ;;
-esac
-
-[ ! -x "$INTERFACE" ] && fail "Bad Isabelle interface: \"$ISABELLE_INTERFACE\""
-
-exec "$INTERFACE" "$@"
--- a/etc/settings Sun Nov 30 12:58:20 2008 +0100
+++ b/etc/settings Sun Nov 30 14:03:45 2008 +0100
@@ -187,23 +187,6 @@
###
-### Interfaces
-###
-
-# Fallback: the null interface (pass-through to raw isabelle process).
-ISABELLE_INTERFACE=none
-
-ISABELLE_INTERFACE=$(choosefrom \
- "$ISABELLE_HOME/contrib/ProofGeneral/isar/interface" \
- "$ISABELLE_HOME/../ProofGeneral/isar/interface" \
- "/usr/local/ProofGeneral/isar/interface" \
- "/usr/share/ProofGeneral/isar/interface" \
- "/opt/ProofGeneral/isar/interface" \
- "/usr/share/emacs/ProofGeneral/isar/interface" \
- "$ISABELLE_INTERFACE")
-
-
-###
### Proof General / Emacs
###
--- a/lib/Tools/install Sun Nov 30 12:58:20 2008 +0100
+++ b/lib/Tools/install Sun Nov 30 14:03:45 2008 +0100
@@ -74,7 +74,7 @@
if [ -n "$BINDIR" ]; then
mkdir -p "$BINDIR" || fail "Bad directory: $BINDIR"
- for NAME in isabelle isabelle-process isabelle-interface
+ for NAME in isabelle isabelle-process
do
BIN="$BINDIR/$NAME"
DIST="$DISTDIR/bin/$NAME"