# HG changeset patch
# User wenzelm
# Date 861265857 -7200
# Node ID 8ba30b031f3181d42e53f5593f8755d46fff7fc9
# Parent  89db5eedecabf2c32f936e0eb28e5a17ef76d552
eliminated PLATFORM;

diff -r 89db5eedecab -r 8ba30b031f31 bin/isabelle
--- a/bin/isabelle	Wed Apr 16 18:53:36 1997 +0200
+++ b/bin/isabelle	Thu Apr 17 10:30:57 1997 +0200
@@ -129,8 +129,8 @@
     INFILE=""
     for DIR in $(echo $ISABELLE_PATH | tr : " ")
     do
-      ISA_PATH="$ISA_PATH $DIR/$ML_SYSTEM-$PLATFORM"
-      [ -z "$INFILE" -a -f $DIR/$ML_SYSTEM-$PLATFORM/$INPUT ] && INFILE=$DIR/$ML_SYSTEM-$PLATFORM/$INPUT
+      ISA_PATH="$ISA_PATH $DIR"
+      [ -z "$INFILE" -a -f $DIR/$INPUT ] && INFILE=$DIR/$INPUT
     done
     if [ -z "$INFILE" ]; then
       echo "Unknown logic \"$INPUT\" -- no heap file found in:" >&2
@@ -154,9 +154,8 @@
     OUTFILE="$OUTPUT"
     ;;
   *)
-    OUTDIR="$ISABELLE_OUTPUT/$ML_SYSTEM-$PLATFORM"
-    mkdir -p "$OUTDIR"
-    OUTFILE="$OUTDIR/$OUTPUT"
+    mkdir -p "$ISABELLE_OUTPUT_DIR"
+    OUTFILE="$ISABELLE_OUTPUT_DIR/$OUTPUT"
     ;;
 esac
 
diff -r 89db5eedecab -r 8ba30b031f31 etc/settings
--- a/etc/settings	Wed Apr 16 18:53:36 1997 +0200
+++ b/etc/settings	Thu Apr 17 10:30:57 1997 +0200
@@ -46,7 +46,7 @@
 
 
 ###
-### Misc path settings etc.
+### Misc path settings
 ###
 
 # The place for user configuration, heap files, etc.
@@ -56,15 +56,14 @@
 ISABELLE_TOOLS=$ISABELLE_HOME/lib/Tools
 
 
-# Heap file input and output locations.  Note that ML system and
-# platform info is appended automatically.
+# Heap file locations.
 
-ISABELLE_PATH=$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps
+ISABELLE_PATH=$ISABELLE_HOME_USER/heaps/$ML_SYSTEM:$ISABELLE_HOME/heaps/$ML_SYSTEM
 
 if [ "$THIS_IS_ISABELLE_BUILD" = true ]; then
-  ISABELLE_OUTPUT=$ISABELLE_HOME/heaps
+  ISABELLE_OUTPUT_DIR=$ISABELLE_HOME/heaps/$ML_SYSTEM
 else
-  ISABELLE_OUTPUT=$ISABELLE_HOME_USER/heaps
+  ISABELLE_OUTPUT_DIR=$ISABELLE_HOME_USER/heaps/$ML_SYSTEM
 fi
 
 DEFAULT_LOGIC=HOL
@@ -95,3 +94,8 @@
 # Simple xterm based interface.
 ISABELLE_INTERFACE=xterm
 ISABELLE_INTERFACE_OPTIONS=""
+
+# GNU Emacs running Isamode.
+#ISABELLE_INTERFACE=emacs
+#ISABELLE_INTERFACE_OPTIONS=""
+#ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode
diff -r 89db5eedecab -r 8ba30b031f31 etc/user-settings.sample
--- a/etc/user-settings.sample	Wed Apr 16 18:53:36 1997 +0200
+++ b/etc/user-settings.sample	Thu Apr 17 10:30:57 1997 +0200
@@ -15,7 +15,6 @@
 ### Heap files
 ###
 
-# Note: ML system and platform info is appended automatically!
 #ISABELLE_PATH=other-places-where-heaps-may-reside:$ISABELLE_PATH
 
 #DEFAULT_LOGIC=ZF
@@ -28,3 +27,8 @@
 # Simple xterm based interface.
 #ISABELLE_INTERFACE=xterm
 #ISABELLE_INTERFACE_OPTIONS="-g 80x50 -s false"
+
+# GNU Emacs running Isamode.
+#ISABELLE_INTERFACE=emacs
+#ISABELLE_INTERFACE_OPTIONS=""
+#ISAMODE_HOME=$ISABELLE_HOME/contrib/Isamode
diff -r 89db5eedecab -r 8ba30b031f31 lib/Tools/findlogics
--- a/lib/Tools/findlogics	Wed Apr 16 18:53:36 1997 +0200
+++ b/lib/Tools/findlogics	Thu Apr 17 10:30:57 1997 +0200
@@ -27,7 +27,7 @@
 
 for DIR in $(echo $ISABELLE_PATH | tr : " ")
 do
-  for FILE in $DIR/$ML_SYSTEM-$PLATFORM/*
+  for FILE in $DIR/*
   do
     if [ -f "$FILE" ]; then
       NAME=$(basename "$FILE")
diff -r 89db5eedecab -r 8ba30b031f31 lib/scripts/getsettings
--- a/lib/scripts/getsettings	Wed Apr 16 18:53:36 1997 +0200
+++ b/lib/scripts/getsettings	Thu Apr 17 10:30:57 1997 +0200
@@ -15,11 +15,6 @@
 unset ENV
 unset BASH_ENV
 
-#get bash-style platform info -- has to work around some tricky features
-unset HOSTTYPE
-unset OSTYPE
-PLATFORM=$(bash -norc -c 'echo $HOSTTYPE-$OSTYPE')
-
 #get actual settings
 . $ISABELLE_HOME/etc/settings || exit 2
 [ -f $ISABELLE_HOME_USER/etc/settings ] && . $ISABELLE_HOME_USER/etc/settings
@@ -27,6 +22,5 @@
 #derived values
 ISABELLE=$ISABELLE_HOME/bin/isabelle
 ISATOOL=$ISABELLE_HOME/bin/isatool
-ISABELLE_OUTPUT_DIR="$ISABELLE_OUTPUT/$ML_SYSTEM-$PLATFORM"
 
 set +o allexport
diff -r 89db5eedecab -r 8ba30b031f31 lib/scripts/isa-emacs
--- a/lib/scripts/isa-emacs	Wed Apr 16 18:53:36 1997 +0200
+++ b/lib/scripts/isa-emacs	Thu Apr 17 10:30:57 1997 +0200
@@ -67,9 +67,8 @@
 
   echo "(setq isa-logic-paths"
   echo -n "'("
-  for D in $(echo $ISABELLE_PATH | tr : " ")
+  for DIR in $(echo $ISABELLE_PATH | tr : " ")
   do
-    DIR="$D/$ML_SYSTEM-$PLATFORM"
     [ -d $DIR ] && echo "\"$DIR\""
   done
   echo "\"$ISAMODE_HOME/ruletables\"))"