equal
deleted
inserted
replaced
52 |
52 |
53 ### |
53 ### |
54 ### JVM components (Scala or Java) |
54 ### JVM components (Scala or Java) |
55 ### |
55 ### |
56 |
56 |
57 if [ -n "$JAVA_HOME" ]; then |
57 if [ -z "$ISABELLE_JDK_HOME" -a -n "$JAVA_HOME" ]; then |
58 ISABELLE_JAVA="$JAVA_HOME/bin/java" |
58 if [ "$(basename "$JAVA_HOME")" = jre -a -e "$(dirname "$JAVA_HOME")"/bin/javac ]; then |
59 else |
59 ISABELLE_JDK_HOME="$(dirname "$JAVA_HOME")" |
60 ISABELLE_JAVA="java" |
60 else |
|
61 ISABELLE_JDK_HOME="$JAVA_HOME" |
|
62 fi |
61 fi |
63 fi |
62 |
64 |
63 ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5" |
65 ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5" |
64 |
66 |
65 |
67 |