# HG changeset patch
# User wenzelm
# Date 1340798194 -7200
# Node ID 39ba7244544cb7730747496332759bdca3126cfb
# Parent  1a6fa9b8140c25026671215d5435302a48ff79f7
some files for universal JDK 1.6.0_31 component;

diff -r 1a6fa9b8140c -r 39ba7244544c Admin/java/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/java/README	Wed Jun 27 13:56:34 2012 +0200
@@ -0,0 +1,4 @@
+This is JDK 1.6.0_31 for Linux and Windows from
+http://www.oracle.com/technetwork/java/javase/downloads/index.html
+
+On Mac OS X the version provided by Apple is used instead.
diff -r 1a6fa9b8140c -r 39ba7244544c Admin/java/settings
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/java/settings	Wed Jun 27 13:56:34 2012 +0200
@@ -0,0 +1,10 @@
+# -*- shell-script -*- :mode=shellscript:
+
+case "$ISABELLE_PLATFORM" in
+  *-darwin)
+    ISABELLE_JDK_HOME="$(/usr/libexec/java_home -v 1.6)"
+    ;;
+  *)
+    ISABELLE_JDK_HOME="$COMPONENT/${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM}/jdk1.6.0_31"
+    ;;
+esac