Use ERROR level for make errors.
Rename the C library addons directories rather than symlinking.
/trunk/scripts/functions | 10 7 3 0 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
1.1 --- a/scripts/functions Sun Oct 12 10:38:02 2008 +0000
1.2 +++ b/scripts/functions Sun Oct 12 11:09:57 2008 +0000
1.3 @@ -88,7 +88,7 @@
1.4 y,*"warning:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
1.5 y,*"WARNING:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
1.6 *"error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
1.7 - *"make["?*"]:"*"Stop.") cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
1.8 + *"make["*"]: *** ["*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
1.9 *) cur_L="${LEVEL}"; cur_l="${level}";;
1.10 esac
1.11 # There will always be a log file (stdout, fd #1), be it /dev/null
1.12 @@ -596,8 +596,12 @@
1.13 # Some addon tarballs directly contain the correct addon directory,
1.14 # while others have the addon directory named after the tarball.
1.15 # Fix that by always using the short name (eg: linuxthreads, ports, etc...)
1.16 - addon_short_name=$(echo "${file}" |sed -r -e 's/^[^-]+-//; s/-[^-]+$//;')
1.17 - [ -d "${addon_short_name}" ] || ln -s "${file}" "${addon_short_name}"
1.18 + addon_short_name=$(echo "${file}" |sed -r -e 's/^[^-]+-([^-]+)-.*$/\1/;')
1.19 + if [ ! -d "${addon_short_name}" ]; then
1.20 + mv "${file}" "${addon_short_name}"
1.21 + # Keep a symlink to avoid re-extracting later on.
1.22 + ln -s "${addon_short_name}" "${file}"
1.23 + fi
1.24 # If libc addon, we're already in the correct place
1.25 else
1.26 cd "${file}"