Alexandre Julliard : transl: Handle the run. log redirection in the higher level scripts.
Alexandre Julliard
julliard at winehq.org
Mon Jun 22 10:11:01 CDT 2009
Module: tools
Branch: master
Commit: b388d996f2c8c5c2296afe971eed77cc52fb98a6
URL: http://source.winehq.org/git/tools.git/?a=commit;h=b388d996f2c8c5c2296afe971eed77cc52fb98a6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jun 22 16:44:12 2009 +0200
transl: Handle the run.log redirection in the higher level scripts.
---
transl/scripts/Master.sh | 2 +-
transl/scripts/checkmakefile.pl | 20 ++++++--------------
winetest/make-winetest | 5 ++++-
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh
index 8b3838b..2391a28 100755
--- a/transl/scripts/Master.sh
+++ b/transl/scripts/Master.sh
@@ -48,7 +48,7 @@ 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" || exit
+$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit
$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" || exit
# Check for a new languages
diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl
index 2eb8c1a..0b98088 100755
--- a/transl/scripts/checkmakefile.pl
+++ b/transl/scripts/checkmakefile.pl
@@ -6,21 +6,13 @@
use Cwd;
use File::Basename;
-sub log_string
-{
- my($string) = shift(@_);
- open(LOG, ">>$workdir/run.log") || die "Couldn't open run.log\n";
- print LOG $string."\n";
- close(LOG);
-}
-
sub shell($)
{
my $cmd = shift;
my $ret = system $cmd;
if ($ret)
{
- log_string $cmd;
+ print STDERR "$cmd\n";
print "!!!!!!! return value: $ret\n";
exit 1;
}
@@ -51,7 +43,7 @@ sub mycheck
# files in dlls/ are compiled with __WINESRC__
$defs .= " -D__WINESRC__" if ($dir =~ m,^dlls,);
- log_string("*** $dir [$defs]");
+ print STDERR "*** $dir [$defs]\n";
my $incl = "-I$srcdir/$dir -I$objdir/$dir -I$srcdir/include -I$objdir/include";
my $norm_fn = $dir;
@@ -61,13 +53,13 @@ sub mycheck
my $srcs = join( " ", map { "$srcdir/$dir/$_"; } @rcfiles );
my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles );
- shell "make -C $objdir/$dir -s $targets 2>>$workdir/run.log";
- shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs 2>>$workdir/run.log";
- shell "$wrc $incl --verify-translation $defs $srcs >$workdir/ver.txt 2>>$workdir/run.log";
+ shell "make -C $objdir/$dir -s $targets";
+ shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs";
+ shell "$wrc $incl --verify-translation $defs $srcs >$workdir/ver.txt";
if ("$dir" eq "dlls/kernel32") {
shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt";
- log_string("*** $name [$defs] (locale run)");
+ print STDERR "*** $name [$defs] (locale run)\n";
shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt";
} else {
shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt";
diff --git a/winetest/make-winetest b/winetest/make-winetest
index 4547c0a..7394638 100755
--- a/winetest/make-winetest
+++ b/winetest/make-winetest
@@ -63,6 +63,7 @@ fi
umask 022
(
+ set -e
(cd wine && git pull) || exit
head=$(cd wine && git rev-parse --short=12 HEAD) || exit
@@ -131,7 +132,7 @@ umask 022
rm -rf work
mkdir work work/langs work/dumps work/dumps/res work/new-langs
- $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts"
+ $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log
$toolsdir/transl/scripts/summary.pl ./work "$toolsdir/transl/scripts"
for i in work/new-langs/*
do
@@ -147,6 +148,8 @@ umask 022
mv -f work/run.log $transldir/dumps/run.log
rm -rf $transldir/langs.old $transldir/dumps.old
+ echo "translations updated"
+
) >$logfile 2>&1 && rm -f $logfile
# if the log file is still here, something failed
More information about the wine-cvs
mailing list