merged

--- a/etc/settings	Mon Nov 15 18:58:30 2010 +0100
+++ b/etc/settings	Mon Nov 15 20:48:48 2010 +0100
@@ -18,13 +18,13 @@
 # Poly/ML 5.x (automated settings)
 POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
 ML_PLATFORM="$ISABELLE_PLATFORM"
-ML_HOME=$(choosefrom \
+ML_HOME="$(choosefrom \
   "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
   "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
   "/usr/local/polyml/$ML_PLATFORM" \
   "/usr/share/polyml/$ML_PLATFORM" \
   "/opt/polyml/$ML_PLATFORM" \
-  $POLY_HOME)
+  "$POLY_HOME")"
 ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
 ML_OPTIONS="-H 200"
 ML_SOURCES="$ML_HOME/../src"
@@ -170,13 +170,13 @@
 ###
 
 # Proof General home, look in a variety of places
-PROOFGENERAL_HOME=$(choosefrom \
+PROOFGENERAL_HOME="$(choosefrom \
   "$ISABELLE_HOME/contrib/ProofGeneral" \
   "$ISABELLE_HOME/../ProofGeneral" \
   "/usr/local/ProofGeneral" \
   "/usr/share/ProofGeneral" \
   "/opt/ProofGeneral" \
-  "")
+  "")"
 
 PROOFGENERAL_OPTIONS=""
 #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"

--- a/lib/scripts/polyml-version	Mon Nov 15 18:58:30 2010 +0100
+++ b/lib/scripts/polyml-version	Mon Nov 15 20:48:48 2010 +0100
@@ -2,11 +2,17 @@
 #
 # polyml-version --- determine Poly/ML runtime system version
 
-echo -n polyml
-
 if [ -x "$ML_HOME/poly" ]; then
-  env LD_LIBRARY_PATH="$ML_HOME:$ML_HOME/../lib:$LD_LIBRARY_PATH" \
+  VERSION="$(env \
+    LD_LIBRARY_PATH="$ML_HOME:$ML_HOME/../lib:$LD_LIBRARY_PATH" \
     DYLD_LIBRARY_PATH="$ML_HOME:$ML_HOME/../lib:$DYLD_LIBRARY_PATH" \
-    "$ML_HOME/poly" -v -H 10 | \
-    sed -n 's,^Poly/ML.*RTS version: [^ ]*\(-[^ ]*\).*$,\1,p'
+    "$ML_HOME/poly" -v -H 10)"
+  REGEXP='^Poly/ML.*RTS version: [^ ]*(-[^ ]*).*$'
+  if [[ "$VERSION" =~ $REGEXP ]]; then
+    echo "polyml${BASH_REMATCH[1]}"
+  else
+    echo polyml-unknown
+  fi
+else
+  echo polyml-unknown
 fi

--- a/lib/scripts/run-polyml	Mon Nov 15 18:58:30 2010 +0100
+++ b/lib/scripts/run-polyml	Mon Nov 15 20:48:48 2010 +0100
@@ -9,24 +9,27 @@
 
 ## diagnostics
 
+function fail()
+{
+  echo "$1" >&2
+  exit 2
+}
+
 function fail_out()
 {
-  echo "Unable to create output heap file: \"$OUTFILE\"" >&2
-  exit 2
+  fail "Unable to create output heap file: \"$OUTFILE\""
 }
 
 function check_file()
 {
-  if [ ! -f "$1" ]; then
-    echo "Unable to locate $1" >&2
-    echo "Please check your ML system settings!" >&2
-    exit 2
-  fi
+  [ ! -f "$1" ] && fail "Unable to locate \"$1\""
 }
 
 
 ## compiler executables and libraries
 
+[ -z "$ML_HOME" ] && fail "Missing ML installation (ML_HOME)"
+
 POLY="$ML_HOME/poly"
 check_file "$POLY"
 

--- a/lib/scripts/run-smlnj	Mon Nov 15 18:58:30 2010 +0100
+++ b/lib/scripts/run-smlnj	Mon Nov 15 20:48:48 2010 +0100
@@ -9,19 +9,20 @@
 
 ## diagnostics
 
+function fail()
+{
+  echo "$1" >&2
+  exit 2
+}
+
 function fail_out()
 {
-  echo "Unable to create output heap file: \"$OUTFILE\"" >&2
-  exit 2
+  fail "Unable to create output heap file: \"$OUTFILE\""
 }
 
 function check_mlhome_file()
 {
-  if [ ! -f "$1" ]; then
-    echo "Unable to locate $1" >&2
-    echo "Please check your ML_HOME setting!" >&2
-    exit 2
-  fi
+  [ ! -f "$1" ] && fail "Unable to locate \"$1\""
 }
 
 function check_heap_file()
@@ -38,6 +39,8 @@
 
 ## compiler binaries
 
+[ -z "$ML_HOME" ] && fail "Missing ML installation (ML_HOME)"
+
 SML="$ML_HOME/sml"
 ARCH_N_OPSYS="$ML_HOME/.arch-n-opsys"
 

--- a/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 18:58:30 2010 +0100
+++ b/src/HOL/Tools/Predicate_Compile/etc/settings	Mon Nov 15 20:48:48 2010 +0100
@@ -1,16 +1,17 @@
+# -*- shell-script -*- :mode=shellscript:
 
-EXEC_SWIPL=$(choosefrom \
+EXEC_SWIPL="$(choosefrom \
   "$ISABELLE_HOME/contrib/swipl/$ISABELLE_PLATFORM/bin/swipl" \
   "$ISABELLE_HOME/contrib_devel/swipl/$ISABELLE_PLATFORM/bin/swipl" \
   "$ISABELLE_HOME/../swipl" \
   $(type -p swipl) \
-  "")
+  "")"
 
-EXEC_YAP=$(choosefrom \
+EXEC_YAP="$(choosefrom \
   "$ISABELLE_HOME/contrib/yap/$ISABELLE_PLATFORM/bin/yap" \
   "$ISABELLE_HOME/contrib_devel/yap/$ISABELLE_PLATFORM/bin/yap" \
   "$ISABELLE_HOME/../yap" \
   $(type -p yap) \
-  "")
+  "")"
 
 SWIPL_VERSION=$("$COMPONENT/lib/scripts/swipl_version")

--- a/src/Tools/Code/etc/settings	Mon Nov 15 18:58:30 2010 +0100
+++ b/src/Tools/Code/etc/settings	Mon Nov 15 20:48:48 2010 +0100
@@ -1,14 +1,15 @@
+# -*- shell-script -*- :mode=shellscript:
 
 ISABELLE_TOOLS="$ISABELLE_TOOLS:$COMPONENT/lib/Tools"
 
-EXEC_GHC=$(choosefrom \
+EXEC_GHC="$(choosefrom \
   "$ISABELLE_HOME/contrib/ghc/$ISABELLE_PLATFORM/ghc" \
   "$ISABELLE_HOME/../ghc/$ISABELLE_PLATFORM/ghc" \
-  $(type -p ghc) \
-  "")
+  "$(type -p ghc)" \
+  "")"
 
-EXEC_OCAML=$(choosefrom \
+EXEC_OCAML="$(choosefrom \
   "$ISABELLE_HOME/contrib/ocaml/$ISABELLE_PLATFORM/ocaml" \
   "$ISABELLE_HOME/../ocaml/$ISABELLE_PLATFORM/ocaml" \
-  $(type -p ocaml) \
-  "")
+  "$(type -p ocaml)" \
+  "")"