diff options
| -rw-r--r-- | config/global.in | 14 | ||||
| -rwxr-xr-x | scripts/crosstool.sh | 22 | ||||
| -rw-r--r-- | scripts/functions | 15 |
3 files changed, 29 insertions, 22 deletions
diff --git a/config/global.in b/config/global.in index f487a8b..5d91847 100644 --- a/config/global.in +++ b/config/global.in @@ -255,13 +255,15 @@ config LOG_PROGRESS_BAR default n depends on ! LOG_ALL help - This option will print a "rotating bar" (/-\|) below the last log line - to show work is not stalled. + If you say 'y' here, you'll be able to see the elapsed time. - Available when not in DEBUG log level. - - WARNING! Very CPU intensive! If you have spare CPU, then you can use it, - otherwise, refrain from using it. + As a bonus, you'll also get a rotating bar (/-\|) showing you + that the build is not stalled (the bar rotates 1/4 every 10 lines + of components build log). + + Note that the elapsed time can stall for a little while if a + component has long commands, as the elapsed time is only updated + each line. config LOG_TO_FILE bool diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index 90d0eba..bcb1ebc 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -27,8 +27,12 @@ fi CT_STAR_DATE=`CT_DoDate +%s%N` CT_STAR_DATE_HUMAN=`CT_DoDate +%Y%m%d.%H%M%S` -# Log to a temporary file until we have built our environment -CT_ACTUAL_LOG_FILE="${CT_TOP_DIR}/$$.log" +# Log policy: +# - what goes to the log file goes to fd #1 (stdout) +# - what goes to the screen goes to fd #6 +tmp_log_file="${CT_TOP_DIR}/$$.log" +exec 6>&1 +exec >>"${tmp_log_file}" # Are we configured? We'll need that later... CT_TestOrAbort "Configuration file not found. Please create one." -f "${CT_TOP_DIR}/.config" @@ -182,22 +186,22 @@ mkdir -p "${CT_CC_CORE_PREFIX_DIR}" # It's quite understandable that the log file will be installed in the install # directory, so we must first ensure it exists and is writeable (above) before # we can log there +exec >/dev/null case "${CT_LOG_TO_FILE},${CT_LOG_FILE}" in - ,*) rm -f "${CT_ACTUAL_LOG_FILE}" - CT_ACTUAL_LOG_FILE=/dev/null + ,*) rm -f "${tmp_log_file}" ;; y,/*) mkdir -p "`dirname \"${CT_LOG_FILE}\"`" - mv "${CT_ACTUAL_LOG_FILE}" "${CT_LOG_FILE}" - CT_ACTUAL_LOG_FILE="${CT_LOG_FILE}" + mv "${tmp_log_file}" "${CT_LOG_FILE}" + exec >>"${CT_LOG_FILE}" ;; y,*) mkdir -p "`pwd`/`dirname \"${CT_LOG_FILE}\"`" - mv "${CT_ACTUAL_LOG_FILE}" "`pwd`/${CT_LOG_FILE}" - CT_ACTUAL_LOG_FILE="`pwd`/${CT_LOG_FILE}" + mv "${tmp_log_file}" "`pwd`/${CT_LOG_FILE}" + exec >>"${CT_LOG_FILE}" ;; esac # Determine build system if not set by the user -CT_Test "You did not specify the build system. Guessing." -z "${CT_BUILD}" +CT_Test "You did not specify the build system. That's OK, I can guess..." -z "${CT_BUILD}" CT_BUILD="`${CT_TOP_DIR}/tools/config.sub \"${CT_BUILD:-\`${CT_TOP_DIR}/tools/config.guess\`}\"`" # Arrange paths depending on wether we use sys-root or not. diff --git a/scripts/functions b/scripts/functions index 41942a4..e535174 100644 --- a/scripts/functions +++ b/scripts/functions @@ -12,7 +12,7 @@ CT_OnError() { for((depth=2; ${BASH_LINENO[$((${depth}-1))]}>0; depth++)); do CT_DoLog ERROR " called from \"${BASH_SOURCE[${depth}]}\" at line # ${BASH_LINENO[${depth}-1]} in function \"${FUNCNAME[${depth}]}\"" done - CT_DoLog ERROR "Look at \"${CT_ACTUAL_LOG_FILE}\" for more info on this error." + [ "${CT_LOG_TO_FILE}" = "y" ] && CT_DoLog ERROR "Look at \"${CT_LOG_FILE}\" for more info on this error." CT_STEP_COUNT=1 CT_DoEnd ERROR exit $ret @@ -54,30 +54,31 @@ CT_DoLog() { cat - else echo "${1}" - fi |( IFS="\n" # We want the full lines, even leading spaces + fi |( offset=$((`CT_DoDate +%s`+(CT_STAR_DATE/(1000*1000*1000)))) + IFS="\n" # We want the full lines, even leading spaces CT_PROG_BAR_CPT=0 indent=$((2*CT_STEP_COUNT)) while read line; do case "${CT_LOG_SEE_TOOLS_WARN},${line}" in y,*"warning:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};; + y,*"WARNING:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};; *"error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; *"make["?*"]:"*"Stop.") cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; *) cur_L="${LEVEL}"; cur_l="${level}";; esac l="`printf \"[%-5s]%*s%s%s\" \"${cur_L}\" \"${indent}\" \" \" \"${line}\"`" # There will always be a log file, be it /dev/null - echo -e "${l}" >>"${CT_ACTUAL_LOG_FILE}" + echo -e "${l}" if [ ${cur_l} -le ${max_level} ]; then - echo -e "\r${l}" + echo -e "\r${l}" >&6 fi if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then - str=`CT_DoDate +%s` - elapsed=$((str-(CT_STAR_DATE/(1000*1000*1000)))) + elapsed=$((SECONDS+OFFSET)) [ ${CT_PROG_BAR_CPT} -eq 0 ] && bar="/" [ ${CT_PROG_BAR_CPT} -eq 10 ] && bar="-" [ ${CT_PROG_BAR_CPT} -eq 20 ] && bar="\\" [ ${CT_PROG_BAR_CPT} -eq 30 ] && bar="|" - printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}" + printf "\r[%02d:%02d] %s " $((elapsed/60)) $((elapsed%60)) "${bar}" >&6 CT_PROG_BAR_CPT=$(((CT_PROG_BAR_CPT+1)%40)) fi done |