Module: tools Branch: master Commit: 865952c2a9b40acae0faa07a1115e4957660f550 URL: http://source.winehq.org/git/tools.git/?a=commit;h=865952c2a9b40acae0faa07a1...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Jun 20 13:27:48 2009 +0200
transl: Terminate the scripts if an error occurs.
---
transl/scripts/Master.sh | 4 ++-- transl/scripts/checkmakefile.pl | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index c85cd7b..8b3838b 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -48,8 +48,8 @@ mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs
# Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" -$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" || exit +$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" || exit
# Check for a new languages for i in $WORKDIR/new-langs/*; do diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index fd919c9..487aa0d 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -53,12 +53,14 @@ sub mycheck $ret = system("$wrc $srcincl $objincl $defs $srcdir/$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); if ($ret != 0) { - print "!!!!!!! 2nd pass return value: ".$ret."\n"; + print "!!!!!!! 2nd pass return value: ".$ret."\n"; + exit 1; } } else { print "!!!!!!! return value: ".$ret."\n"; + exit 1; } }