1.1 --- a/scripts/functions	Tue May 08 12:57:52 2007 +0000
     1.2 +++ b/scripts/functions	Tue May 08 17:48:32 2007 +0000
     1.3 @@ -29,6 +29,7 @@
     1.4  CT_LOG_LEVEL_INFO=2
     1.5  CT_LOG_LEVEL_EXTRA=3
     1.6  CT_LOG_LEVEL_DEBUG=4
     1.7 +CT_LOG_LEVEL_ALL=5
     1.8  
     1.9  # Attributes
    1.10  _A_NOR="\\033[0m"
    1.11 @@ -56,6 +57,7 @@
    1.12  #   - INFO:    Informational messages
    1.13  #   - EXTRA:   Extra informational messages
    1.14  #   - DEBUG:   Debug messages
    1.15 +#   - ALL:     Component's build messages
    1.16  # Usage: CT_DoLog <level> [message]
    1.17  # If message is empty, then stdin will be logged.
    1.18  CT_DoLog() {
    1.19 @@ -63,7 +65,7 @@
    1.20      local l
    1.21      eval max_level="\${CT_LOG_LEVEL_${CT_LOG_LEVEL_MAX}}"
    1.22      # Set the maximum log level to DEBUG if we have none
    1.23 -    [ -z ${max_level} ] && max_level=${CT_LOG_LEVEL_DEBUG}
    1.24 +    [ -z "${max_level}" ] && max_level=${CT_LOG_LEVEL_DEBUG}
    1.25  
    1.26      LEVEL="$1"; shift
    1.27      eval level="\${CT_LOG_LEVEL_${LEVEL}}"
    1.28 @@ -79,7 +81,7 @@
    1.29                case "${CT_LOG_SEE_TOOLS_WARN},${line}" in
    1.30                  y,*"warning:"*)         cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
    1.31                  *"error:"*)             cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
    1.32 -                "make["?*"]:"*"Stop.")  cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
    1.33 +                *"make["?*"]:"*"Stop.") cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
    1.34                  *)                      cur_L="${LEVEL}"; cur_l="${level}";;
    1.35                esac
    1.36                l="`printf \"[%-5s]%*s%s%s\" \"${cur_L}\" \"${indent}\" \" \" \"${line}\"`"
    1.37 @@ -249,8 +251,8 @@
    1.38      local _curl=`which curl`
    1.39      case "${_wget},${_curl}" in
    1.40          ,)  CT_DoError "Could find neither wget nor curl";;
    1.41 -        ,*) CT_DoGetFileCurl "$1";;
    1.42 -        *)  CT_DoGetFileWget "$1";;
    1.43 +        ,*) CT_DoGetFileCurl "$1" |CT_DoLog DEBUG;;
    1.44 +        *)  CT_DoGetFileWget "$1" |CT_DoLog DEBUG;;
    1.45      esac
    1.46  }
    1.47  
    1.48 @@ -270,7 +272,7 @@
    1.49              CT_DoLog DEBUG "Removing already present \"${file}\""
    1.50              rm -f "${CT_TARBALLS_DIR}/${file}${ext}"
    1.51          else
    1.52 -            CT_DoLog EXTRA "Already have \"${file}\""
    1.53 +            CT_DoLog DEBUG "Already have \"${file}\""
    1.54              return 0
    1.55          fi
    1.56      fi
    1.57 @@ -285,8 +287,8 @@
    1.58              # Try all urls in turn
    1.59              for url in "$@"; do
    1.60                  case "${url}" in
    1.61 -                    *)  CT_DoLog EXTRA "Trying \"${url}/${file}${ext}\""
    1.62 -                        CT_DoGetFile "${url}/${file}${ext}" 2>&1 |CT_DoLog DEBUG
    1.63 +                    *)  CT_DoLog DEBUG "Trying \"${url}/${file}${ext}\""
    1.64 +                        CT_DoGetFile "${url}/${file}${ext}" 2>&1
    1.65                          ;;
    1.66                  esac
    1.67                  [ -f "${file}${ext}" ] && got_it=1 && break 2 || true
    1.68 @@ -357,15 +359,15 @@
    1.69  
    1.70      # If the directory exists, then consider extraction and patching done
    1.71      if [ -d "${file}" ]; then
    1.72 -        CT_DoLog EXTRA "Already extracted \"${file}\""
    1.73 +        CT_DoLog DEBUG "Already extracted \"${file}\""
    1.74          return 0
    1.75      fi
    1.76  
    1.77      CT_DoLog EXTRA "Extracting \"${file}\""
    1.78      case "${ext}" in
    1.79 -        .tar.bz2)     tar xvjf "${full_file}" |CT_DoLog DEBUG;;
    1.80 -        .tar.gz|.tgz) tar xvzf "${full_file}" |CT_DoLog DEBUG;;
    1.81 -        .tar)         tar xvf  "${full_file}" |CT_DoLog DEBUG;;
    1.82 +        .tar.bz2)     tar xvjf "${full_file}" |CT_DoLog ALL;;
    1.83 +        .tar.gz|.tgz) tar xvzf "${full_file}" |CT_DoLog ALL;;
    1.84 +        .tar)         tar xvf  "${full_file}" |CT_DoLog ALL;;
    1.85          *)            CT_Abort "Don't know how to handle \"${file}\": unknown extension" ;;
    1.86      esac
    1.87  
    1.88 @@ -396,7 +398,7 @@
    1.89              for p in "${patch_dir}"/*.patch; do
    1.90                  if [ -f "${p}" ]; then
    1.91                      CT_DoLog DEBUG "Applying patch \"${p}\""
    1.92 -                    patch -g0 -F1 -p1 -f <"${p}" |CT_DoLog DEBUG
    1.93 +                    patch -g0 -F1 -p1 -f <"${p}" |CT_DoLog ALL
    1.94                      CT_TestAndAbort "Failed while applying patch file \"${p}\"" ${PIPESTATUS[0]} -ne 0
    1.95                  fi
    1.96              done