equal
deleted
inserted
replaced
97 ML_IDENTIFIER="$ML_SYSTEM" |
97 ML_IDENTIFIER="$ML_SYSTEM" |
98 else |
98 else |
99 ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" |
99 ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" |
100 fi |
100 fi |
101 |
101 |
|
102 #OCaml |
|
103 if [ -z "$ISABELLE_OCAML" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocaml" ]; then |
|
104 ISABELLE_OCAML="$ISABELLE_HOME/lib/Tools/ocaml" |
|
105 fi |
|
106 if [ -z "$ISABELLE_OCAMLC" -a -f "$ISABELLE_OPAM_ROOT/$ISABELLE_OCAML_VERSION/bin/ocamlc" ]; then |
|
107 ISABELLE_OCAMLC="$ISABELLE_HOME/lib/Tools/ocamlc" |
|
108 fi |
|
109 |
102 #enforce JAVA_HOME |
110 #enforce JAVA_HOME |
103 if [ -d "$ISABELLE_JDK_HOME/jre" ] |
111 if [ -d "$ISABELLE_JDK_HOME/jre" ] |
104 then |
112 then |
105 export JAVA_HOME="$ISABELLE_JDK_HOME/jre" |
113 export JAVA_HOME="$ISABELLE_JDK_HOME/jre" |
106 else |
114 else |