lib/Tools/build
changeset 59891 9ce697050455
parent 59565 96e860a17b9a
child 59892 2a616319c171
     1.1 --- a/lib/Tools/build	Wed Apr 01 13:32:32 2015 +0200
     1.2 +++ b/lib/Tools/build	Wed Apr 01 15:41:08 2015 +0200
     1.3 @@ -34,6 +34,7 @@
     1.4    echo "    -d DIR       include session directory"
     1.5    echo "    -g NAME      select session group NAME"
     1.6    echo "    -j INT       maximum number of parallel jobs (default 1)"
     1.7 +  echo "    -k KEYWORD   check theory sources for conflicts with proposed keywords"
     1.8    echo "    -l           list session source files"
     1.9    echo "    -n           no build -- test dependencies only"
    1.10    echo "    -o OPTION    override Isabelle system OPTION (via NAME=VAL or NAME)"
    1.11 @@ -68,13 +69,14 @@
    1.12  declare -a INCLUDE_DIRS=()
    1.13  declare -a SESSION_GROUPS=()
    1.14  MAX_JOBS=1
    1.15 +declare -a CHECK_KEYWORDS=()
    1.16  LIST_FILES=false
    1.17  NO_BUILD=false
    1.18  eval "declare -a BUILD_OPTIONS=($ISABELLE_BUILD_OPTIONS)"
    1.19  SYSTEM_MODE=false
    1.20  VERBOSE=false
    1.21  
    1.22 -while getopts "D:Rabcd:g:j:lno:sv" OPT
    1.23 +while getopts "D:Rabcd:g:j:k:lno:sv" OPT
    1.24  do
    1.25    case "$OPT" in
    1.26      D)
    1.27 @@ -102,6 +104,9 @@
    1.28        check_number "$OPTARG"
    1.29        MAX_JOBS="$OPTARG"
    1.30        ;;
    1.31 +    k)
    1.32 +      CHECK_KEYWORDS["${#CHECK_KEYWORDS[@]}"]="$OPTARG"
    1.33 +      ;;
    1.34      l)
    1.35        LIST_FILES="true"
    1.36        ;;
    1.37 @@ -145,7 +150,8 @@
    1.38    "$REQUIREMENTS" "$ALL_SESSIONS" "$BUILD_HEAP" "$CLEAN_BUILD" "$MAX_JOBS" \
    1.39    "$LIST_FILES" "$NO_BUILD" "$SYSTEM_MODE" "$VERBOSE" \
    1.40    "${INCLUDE_DIRS[@]}" $'\n' "${SELECT_DIRS[@]}" $'\n' \
    1.41 -  "${SESSION_GROUPS[@]}" $'\n' "${BUILD_OPTIONS[@]}" $'\n' "$@"
    1.42 +  "${SESSION_GROUPS[@]}" $'\n' "${CHECK_KEYWORDS[@]}" $'\n' \
    1.43 +  "${BUILD_OPTIONS[@]}" $'\n' "$@"
    1.44  RC="$?"
    1.45  
    1.46  if [ "$NO_BUILD" = false -a "$VERBOSE" = true ]; then