1.1 --- a/bin/isabelle	Wed Apr 16 18:53:36 1997 +0200
     1.2 +++ b/bin/isabelle	Thu Apr 17 10:30:57 1997 +0200
     1.3 @@ -129,8 +129,8 @@
     1.4      INFILE=""
     1.5      for DIR in $(echo $ISABELLE_PATH | tr : " ")
     1.6      do
     1.7 -      ISA_PATH="$ISA_PATH $DIR/$ML_SYSTEM-$PLATFORM"
     1.8 -      [ -z "$INFILE" -a -f $DIR/$ML_SYSTEM-$PLATFORM/$INPUT ] && INFILE=$DIR/$ML_SYSTEM-$PLATFORM/$INPUT
     1.9 +      ISA_PATH="$ISA_PATH $DIR"
    1.10 +      [ -z "$INFILE" -a -f $DIR/$INPUT ] && INFILE=$DIR/$INPUT
    1.11      done
    1.12      if [ -z "$INFILE" ]; then
    1.13        echo "Unknown logic \"$INPUT\" -- no heap file found in:" >&2
    1.14 @@ -154,9 +154,8 @@
    1.15      OUTFILE="$OUTPUT"
    1.16      ;;
    1.17    *)
    1.18 -    OUTDIR="$ISABELLE_OUTPUT/$ML_SYSTEM-$PLATFORM"
    1.19 -    mkdir -p "$OUTDIR"
    1.20 -    OUTFILE="$OUTDIR/$OUTPUT"
    1.21 +    mkdir -p "$ISABELLE_OUTPUT_DIR"
    1.22 +    OUTFILE="$ISABELLE_OUTPUT_DIR/$OUTPUT"
    1.23      ;;
    1.24  esac
    1.25  

     2.1 --- a/etc/settings	Wed Apr 16 18:53:36 1997 +0200
     2.2 +++ b/etc/settings	Thu Apr 17 10:30:57 1997 +0200
     2.3 @@ -46,7 +46,7 @@
     2.4  
     2.5  
     2.6  ###
     2.7 -### Misc path settings etc.
     2.8 +### Misc path settings
     2.9  ###
    2.10  
    2.11  # The place for user configuration, heap files, etc.
    2.12 @@ -56,15 +56,14 @@
    2.13  ISABELLE_TOOLS=$ISABELLE_HOME/lib/Tools
    2.14  
    2.15  
    2.16 -# Heap file input and output locations.  Note that ML system and
    2.17 -# platform info is appended automatically.
    2.18 +# Heap file locations.
    2.19  
    2.20 -ISABELLE_PATH=$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps
    2.21 +ISABELLE_PATH=$ISABELLE_HOME_USER/heaps/$ML_SYSTEM:$ISABELLE_HOME/heaps/$ML_SYSTEM
    2.22  
    2.23  if [ "$THIS_IS_ISABELLE_BUILD" = true ]; then
    2.24 -  ISABELLE_OUTPUT=$ISABELLE_HOME/heaps
    2.25 +  ISABELLE_OUTPUT_DIR=$ISABELLE_HOME/heaps/$ML_SYSTEM
    2.26  else
    2.27 -  ISABELLE_OUTPUT=$ISABELLE_HOME_USER/heaps
    2.28 +  ISABELLE_OUTPUT_DIR=$ISABELLE_HOME_USER/heaps/$ML_SYSTEM
    2.29  fi
    2.30  
    2.31  DEFAULT_LOGIC=HOL
    2.32 @@ -95,3 +94,8 @@
    2.33  # Simple xterm based interface.
    2.34  ISABELLE_INTERFACE=xterm
    2.35  ISABELLE_INTERFACE_OPTIONS=""
    2.36 +
    2.37 +# GNU Emacs running Isamode.
    2.38 +#ISABELLE_INTERFACE=emacs
    2.39 +#ISABELLE_INTERFACE_OPTIONS=""
    2.40 +#ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode

     3.1 --- a/etc/user-settings.sample	Wed Apr 16 18:53:36 1997 +0200
     3.2 +++ b/etc/user-settings.sample	Thu Apr 17 10:30:57 1997 +0200
     3.3 @@ -15,7 +15,6 @@
     3.4  ### Heap files
     3.5  ###
     3.6  
     3.7 -# Note: ML system and platform info is appended automatically!
     3.8  #ISABELLE_PATH=other-places-where-heaps-may-reside:$ISABELLE_PATH
     3.9  
    3.10  #DEFAULT_LOGIC=ZF
    3.11 @@ -28,3 +27,8 @@
    3.12  # Simple xterm based interface.
    3.13  #ISABELLE_INTERFACE=xterm
    3.14  #ISABELLE_INTERFACE_OPTIONS="-g 80x50 -s false"
    3.15 +
    3.16 +# GNU Emacs running Isamode.
    3.17 +#ISABELLE_INTERFACE=emacs
    3.18 +#ISABELLE_INTERFACE_OPTIONS=""
    3.19 +#ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode

     4.1 --- a/lib/Tools/findlogics	Wed Apr 16 18:53:36 1997 +0200
     4.2 +++ b/lib/Tools/findlogics	Thu Apr 17 10:30:57 1997 +0200
     4.3 @@ -27,7 +27,7 @@
     4.4  
     4.5  for DIR in $(echo $ISABELLE_PATH | tr : " ")
     4.6  do
     4.7 -  for FILE in $DIR/$ML_SYSTEM-$PLATFORM/*
     4.8 +  for FILE in $DIR/*
     4.9    do
    4.10      if [ -f "$FILE" ]; then
    4.11        NAME=$(basename "$FILE")

     5.1 --- a/lib/scripts/getsettings	Wed Apr 16 18:53:36 1997 +0200
     5.2 +++ b/lib/scripts/getsettings	Thu Apr 17 10:30:57 1997 +0200
     5.3 @@ -15,11 +15,6 @@
     5.4  unset ENV
     5.5  unset BASH_ENV
     5.6  
     5.7 -#get bash-style platform info -- has to work around some tricky features
     5.8 -unset HOSTTYPE
     5.9 -unset OSTYPE
    5.10 -PLATFORM=$(bash -norc -c 'echo $HOSTTYPE-$OSTYPE')
    5.11 -
    5.12  #get actual settings
    5.13  . $ISABELLE_HOME/etc/settings || exit 2
    5.14  [ -f $ISABELLE_HOME_USER/etc/settings ] && . $ISABELLE_HOME_USER/etc/settings
    5.15 @@ -27,6 +22,5 @@
    5.16  #derived values
    5.17  ISABELLE=$ISABELLE_HOME/bin/isabelle
    5.18  ISATOOL=$ISABELLE_HOME/bin/isatool
    5.19 -ISABELLE_OUTPUT_DIR="$ISABELLE_OUTPUT/$ML_SYSTEM-$PLATFORM"
    5.20  
    5.21  set +o allexport

     6.1 --- a/lib/scripts/isa-emacs	Wed Apr 16 18:53:36 1997 +0200
     6.2 +++ b/lib/scripts/isa-emacs	Thu Apr 17 10:30:57 1997 +0200
     6.3 @@ -67,9 +67,8 @@
     6.4  
     6.5    echo "(setq isa-logic-paths"
     6.6    echo -n "'("
     6.7 -  for D in $(echo $ISABELLE_PATH | tr : " ")
     6.8 +  for DIR in $(echo $ISABELLE_PATH | tr : " ")
     6.9    do
    6.10 -    DIR="$D/$ML_SYSTEM-$PLATFORM"
    6.11      [ -d $DIR ] && echo "\"$DIR\""
    6.12    done
    6.13    echo "\"$ISAMODE_HOME/ruletables\"))"