# HG changeset patch
# User wenzelm
# Date 1609867663 -3600
# Node ID 0b0c651e823f745df3268b811da60371f4ef7d0a
# Parent  abaff6fb0ff29e64382931daee2de0be9f58e00b
more portable component setup;

diff -r abaff6fb0ff2 -r 0b0c651e823f src/Pure/Admin/build_release.scala
--- a/src/Pure/Admin/build_release.scala	Tue Jan 05 18:21:14 2021 +0100
+++ b/src/Pure/Admin/build_release.scala	Tue Jan 05 18:27:43 2021 +0100
@@ -260,6 +260,9 @@
 ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)/../.."; pwd)"
 source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
 
+COMPONENT="$ISABELLE_HOME/contrib/""" + jdk_component + """"
+source "$COMPONENT/etc/settings"
+
 
 # Java runtime options
 
@@ -271,7 +274,7 @@
 #paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
 unset XMODIFIERS
 
-exec "$ISABELLE_HOME/contrib/""" + jdk_component + """/x86_64-linux/jre/bin/java" \
+exec "$ISABELLE_JDK_HOME/bin/java" \
   "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
   -classpath """" + classpath.map(p => "$ISABELLE_HOME/" + p.implode).mkString(":") + """" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \