diff -r 923f1e199f4f -r 87868964733c lib/Tools/build_dialog --- a/lib/Tools/build_dialog Thu Dec 06 16:07:09 2012 +0100 +++ b/lib/Tools/build_dialog Thu Dec 06 17:59:37 2012 +0100 @@ -16,6 +16,7 @@ echo echo " Options are:" echo " -C check for existing image" + echo " -L OPTION default logic via system option" echo " -d DIR include session directory" echo " -s system build mode: produce output in ISABELLE_HOME" echo @@ -34,15 +35,19 @@ ## process command line CHECK_EXISTING=false +LOGIC_OPTION="" declare -a INCLUDE_DIRS=() SYSTEM_MODE=false -while getopts "Cd:s" OPT +while getopts "CL:d:s" OPT do case "$OPT" in C) CHECK_EXISTING="true" ;; + L) + LOGIC_OPTION="$OPTARG" + ;; d) INCLUDE_DIRS["${#INCLUDE_DIRS[@]}"]="$OPTARG" ;; @@ -65,27 +70,10 @@ SESSION="$1"; shift -## existing image +## main -EXISTING=false -if [ "$CHECK_EXISTING" = true ]; then - declare -a ISABELLE_PATHS=() - splitarray ":" "$ISABELLE_PATH"; ISABELLE_PATHS=("${SPLITARRAY[@]}") +[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; } - for DIR in "${ISABELLE_PATHS[@]}" - do - FILE="$DIR/$ML_IDENTIFIER/$SESSION" - [ -f "$FILE" ] && EXISTING=true - done -fi - +"$ISABELLE_TOOL" java isabelle.Build_Dialog \ + "$CHECK_EXISTING" "$LOGIC_OPTION" "$SYSTEM_MODE" "$SESSION" "${INCLUDE_DIRS[@]}" -## build - -if [ "$EXISTING" = false ]; then - [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; } - - "$ISABELLE_TOOL" java isabelle.Build_Dialog \ - "$SYSTEM_MODE" "$SESSION" "${INCLUDE_DIRS[@]}" -fi -