# HG changeset patch
# User wenzelm
# Date 1334581787 -7200
# Node ID f4348634595be209a81b00f86d5fd2a73da15249
# Parent  04e7d09ade7a0e9f182f117232fdf210324b0024
more precise handling of java failure, due to missing ISABELLE_JDK_HOME;

diff -r 04e7d09ade7a -r f4348634595b lib/scripts/getsettings
--- a/lib/scripts/getsettings	Mon Apr 16 11:24:57 2012 +0200
+++ b/lib/scripts/getsettings	Mon Apr 16 15:09:47 2012 +0200
@@ -97,7 +97,7 @@
 function isabelle_jdk () {
   if [ -z "$ISABELLE_JDK_HOME" ]; then
     echo "Unknown ISABELLE_JDK_HOME -- Java tools unavailable" >&2
-    return 2
+    return 127
   else
     local PRG="$1"; shift
     "$ISABELLE_JDK_HOME/bin/$PRG" "$@"
@@ -108,10 +108,10 @@
 function isabelle_scala () {
   if [ -z "$ISABELLE_JDK_HOME" ]; then
     echo "Unknown ISABELLE_JDK_HOME -- Java tools unavailable" >&2
-    return 2
+    return 127
   elif [ -z "$SCALA_HOME" ]; then
     echo "Unknown SCALA_HOME -- Scala unavailable" >&2
-    return 2
+    return 127
   else
     local PRG="$1"; shift
     "$SCALA_HOME/bin/$PRG" "$@"
diff -r 04e7d09ade7a -r f4348634595b src/HOL/Tools/Nitpick/kodkod.ML
--- a/src/HOL/Tools/Nitpick/kodkod.ML	Mon Apr 16 11:24:57 2012 +0200
+++ b/src/HOL/Tools/Nitpick/kodkod.ML	Mon Apr 16 15:09:47 2012 +0200
@@ -1067,7 +1067,7 @@
                   TimedOut js
                 else if code = 0 then
                   Normal ([], js, first_error)
-                else if has_error "exec: java" then
+                else if code = 127 then
                   JavaNotInstalled
                 else if has_error "UnsupportedClassVersionError" then
                   JavaTooOld
diff -r 04e7d09ade7a -r f4348634595b src/HOL/Tools/Nitpick/nitpick.ML
--- a/src/HOL/Tools/Nitpick/nitpick.ML	Mon Apr 16 11:24:57 2012 +0200
+++ b/src/HOL/Tools/Nitpick/nitpick.ML	Mon Apr 16 15:09:47 2012 +0200
@@ -178,7 +178,7 @@
                (length ts downto 1) ts))]
 
 fun install_java_message () =
-  "Nitpick requires a Java 1.5 virtual machine called \"java\"."
+  "Nitpick requires Java Development Kit 1.6/1.7 via ISABELLE_JDK_HOME setting."
 fun install_kodkodi_message () =
   "Nitpick requires the external Java program Kodkodi. To install it, download \
   \the package from \"http://www21.in.tum.de/~blanchet/#software\" and add the \