anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* header_check.sh: fix error order

Browse Source
This commit is contained in:
Pavel Sanda 2013-05-15 03:42:13 -07:00
parent 6e992e3544
commit 392124e03e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
development/tools/header_check.sh
View File

@ -36,7 +36,7 @@ LOG_FILE="$(basename $0).log"
# require headers not needed on win/linux. So check the logs before # require headers not needed on win/linux. So check the logs before
# deleting "redundant" standard libraries, Qt headers or includes around # deleting "redundant" standard libraries, Qt headers or includes around
# various ifdefs... # various ifdefs...
EXCLUDE='\(debug.h\|cstdio\|config\)' EXCLUDE='\(debug.h\|cstdio\|config.h\)'
NCORES=$(grep "CPU" /proc/cpuinfo | wc -l) NCORES=$(grep "CPU" /proc/cpuinfo | wc -l)
@ -45,15 +45,18 @@ function BUILD_FN ()
PREFIX='' PREFIX=''
# This is not a clean make. # This is not a clean make.
IFS='' ERROR_OUTPUT=$(make -j${NCORES} 2>&1) make -j${NCORES} 2>&1 > /dev/null
ERROR_CODE=$? ERROR_CODE=$?
# The sed regex is more strict than it needs to be.
if (( ERROR_CODE != 0 )); then
# Use just one core, so we don't mix outputs
IFS='' ERROR_OUTPUT=$(make 2>&1)
# Without the grep, ERROR_OUTPUT might contain messages such as: # Without the grep, ERROR_OUTPUT might contain messages such as:
# 2885 translated messages, 2169 fuzzy translations, 1356 untranslated messages. # 2885 translated messages, 2169 fuzzy translations, 1356 untranslated messages.
ERROR_OUTPUT=$(echo "${ERROR_OUTPUT}" | grep -i "error: ") ERROR_OUTPUT=$(echo "${ERROR_OUTPUT}" | grep -i "error: ")
# The sed regex is more strict than it needs to be.
if (( ERROR_CODE != 0 )); then
cppORh=$(echo "${ERROR_OUTPUT}" | head -n 1 | \ cppORh=$(echo "${ERROR_OUTPUT}" | head -n 1 | \
sed 's/.*\.\(cpp\|h\):[0-9]\+:[0-9]\+: error: .*/\1/') sed 's/.*\.\(cpp\|h\):[0-9]\+:[0-9]\+: error: .*/\1/')
if [ "${cppORh}" = "cpp" ]; then if [ "${cppORh}" = "cpp" ]; then