# HG changeset patch
# User wenzelm
# Date 1414437653 -3600
# Node ID d6d9bb806bb56fbde8ee91bb2e7726c23c572553
# Parent  00916b0dd596719dcc53df06a06baddcff00f13f
JRE is sufficient for official release -- javac and jar are only needed for self-build;

diff -r 00916b0dd596 -r d6d9bb806bb5 Admin/Linux/Isabelle.run
--- a/Admin/Linux/Isabelle.run	Mon Oct 27 16:11:24 2014 +0100
+++ b/Admin/Linux/Isabelle.run	Mon Oct 27 20:20:53 2014 +0100
@@ -22,7 +22,7 @@
 #paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
 unset XMODIFIERS
 
-exec "$ISABELLE_HOME/contrib/jdk/${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}/bin/java" \
+exec "$ISABELLE_HOME/contrib/jdk/${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}/jre/bin/java" \
   "-Disabelle.home=$ISABELLE_HOME" \
   {JAVA_ARGS} \
   -classpath "{CLASSPATH}" \
diff -r 00916b0dd596 -r d6d9bb806bb5 Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Mon Oct 27 16:11:24 2014 +0100
+++ b/Admin/lib/Tools/makedist_bundle	Mon Oct 27 20:20:53 2014 +0100
@@ -145,6 +145,31 @@
 }
 
 
+# purge jdk -- keep only jre
+
+function purge_jdk
+{
+  local DIR="contrib/jdk/$1"
+  (
+    cd "$ISABELLE_TARGET"
+    if [ -d "$DIR/jre" ]; then
+      for X in "$DIR"/*
+      do
+        case "$X" in
+          */jre) ;;
+          *)
+            echo "removing $X"
+            rm -rf "$X"
+            ;;
+        esac
+      done
+    else
+      fail "Bad JDK directory: \"$DIR\""
+    fi
+  )
+}
+
+
 # platform-specific setup (inside archive)
 
 perl -pi -e "s,view.title=Isabelle/jEdit,view.title=${ISABELLE_NAME},g;" \
@@ -153,6 +178,8 @@
 case "$PLATFORM_FAMILY" in
   linux)
     purge_contrib '-name "x86*-darwin" -o -name "x86*-cygwin" -o -name "x86*-windows"'
+    purge_jdk "x86-linux"
+    purge_jdk "x86_64-linux"
 
     LINUX_CLASSPATH=""
     for ENTRY in "${DISTRIBITION_CLASSPATH[@]}"
@@ -173,6 +200,7 @@
     ;;
   macos)
     purge_contrib '-name "x86*-linux" -o -name "x86*-cygwin" -o -name "x86*-windows"'
+    purge_jdk "x86_64-darwin/Contents/Home"
     mv "$ISABELLE_TARGET/contrib/macos_app" "$TMP/."
 
     perl -pi \
@@ -185,6 +213,7 @@
     ;;
   windows)
     purge_contrib '-name "x86*-linux" -o -name "x86*-darwin"'
+    purge_jdk "x86-cygwin"
     mv "$ISABELLE_TARGET/contrib/windows_app" "$TMP/."
 
     perl -pi \