equal
deleted
inserted
replaced
19 fi |
19 fi |
20 |
20 |
21 #key executables |
21 #key executables |
22 ISABELLE="$ISABELLE_HOME/bin/isabelle-process" |
22 ISABELLE="$ISABELLE_HOME/bin/isabelle-process" |
23 ISATOOL="$ISABELLE_HOME/bin/isatool" |
23 ISATOOL="$ISABELLE_HOME/bin/isatool" |
|
24 |
|
25 #Isabelle version |
|
26 ISABELLE_VERSION=$("$ISABELLE_HOME/lib/Tools/version") |
|
27 if [ "$ISABELLE_VERSION" = "Isabelle repository version" ]; then |
|
28 ISABELLE_IDENTIFIER="" |
|
29 else |
|
30 ISABELLE_IDENTIFIER="$ISABELLE_VERSION" |
|
31 fi |
24 |
32 |
25 #users tend to put strange things in here ... |
33 #users tend to put strange things in here ... |
26 unset ENV |
34 unset ENV |
27 unset BASH_ENV |
35 unset BASH_ENV |
28 |
36 |
48 [ "$ISABELLE_HOME" -ef "$ISABELLE_HOME_USER" ] && \ |
56 [ "$ISABELLE_HOME" -ef "$ISABELLE_HOME_USER" ] && \ |
49 { echo >&2 "### ISABELLE_HOME and ISABELLE_HOME_USER should not be the same directory!"; } |
57 { echo >&2 "### ISABELLE_HOME and ISABELLE_HOME_USER should not be the same directory!"; } |
50 [ -z "$ISABELLE_IGNORE_USER_SETTINGS" -a -f "$ISABELLE_HOME_USER/etc/settings" ] && \ |
58 [ -z "$ISABELLE_IGNORE_USER_SETTINGS" -a -f "$ISABELLE_HOME_USER/etc/settings" ] && \ |
51 { source "$ISABELLE_HOME_USER/etc/settings" || exit 2; } |
59 { source "$ISABELLE_HOME_USER/etc/settings" || exit 2; } |
52 |
60 |
53 #produce ML system and Isabelle version identifier |
61 #ML system identifier |
54 if [ -z "$ML_PLATFORM" ]; then |
62 if [ -z "$ML_PLATFORM" ]; then |
55 ML_IDENTIFIER="$ML_SYSTEM" |
63 ML_IDENTIFIER="$ML_SYSTEM" |
56 else |
64 else |
57 ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" |
65 ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}" |
58 fi |
|
59 |
|
60 ISABELLE_VERSION=$("$ISABELLE_HOME/lib/Tools/version") |
|
61 if [ "$ISABELLE_VERSION" != "Isabelle repository version" -a "$THIS_IS_ISABELLE_BUILD" != true ] |
|
62 then |
|
63 ML_IDENTIFIER="${ML_IDENTIFIER}_${ISABELLE_VERSION}" |
|
64 fi |
66 fi |
65 |
67 |
66 ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER" |
68 ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER" |
67 |
69 |
68 set +o allexport |
70 set +o allexport |