wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Nicolas Le Cam : user32/tests: Ignore WM_TIMECHANGE message.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 1d7d110f1c2d8d3401f966c0913209793c633f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7d110f1c2d8d3401f966c09… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 20 12:19:51 2009 +0200 user32/tests: Ignore WM_TIMECHANGE message. --- dlls/user32/tests/input.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d100610..6ef7817 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -824,7 +824,8 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, Msg != WM_GETTEXT && Msg != WM_GETICON && Msg != WM_IME_SELECT && - Msg != WM_DEVICECHANGE) + Msg != WM_DEVICECHANGE && + Msg != WM_TIMECHANGE) { ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); if (sent_messages_cnt < MAXKEYMESSAGES)

1 0

Vincent Povirk : winex11.drv: Link the windows JFIF format to the X image/ jpeg format.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 6259aeaacbe5293bdeb6a56d27df75a3d4e8c6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6259aeaacbe5293bdeb6a56d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 19 13:54:33 2009 -0500 winex11.drv: Link the windows JFIF format to the X image/jpeg format. --- dlls/winex11.drv/clipboard.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 22445d7..3806080 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -293,6 +293,7 @@ static WINE_CLIPFORMAT ClipFormats[] = /* Maps X properties to Windows formats */ static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; static const WCHAR wszGIF[] = {'G','I','F',0}; +static const WCHAR wszJFIF[] = {'J','F','I','F',0}; static const WCHAR wszPNG[] = {'P','N','G',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct @@ -304,6 +305,7 @@ static const struct { wszRichTextFormat, XATOM_text_rtf }, { wszRichTextFormat, XATOM_text_richtext }, { wszGIF, XATOM_image_gif }, + { wszJFIF, XATOM_image_jpeg }, { wszPNG, XATOM_image_png }, { wszHTMLFormat, XATOM_text_html }, }; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 03d7307..95706eb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -635,6 +635,7 @@ enum x11drv_atoms XATOM_XdndTypeList, XATOM_WCF_DIB, XATOM_image_gif, + XATOM_image_jpeg, XATOM_image_png, XATOM_text_html, XATOM_text_plain, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 924dc66..8299457 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -172,6 +172,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "XdndTypeList", "WCF_DIB", "image/gif", + "image/jpeg", "image/png", "text/html", "text/plain",

1 0

Vincent Povirk : winex11.drv: Link the windows PNG format to the X image/ png format.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e4663206be9c39ebf2e0a72aaad334f1163123f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4663206be9c39ebf2e0a72aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 19 13:46:57 2009 -0500 winex11.drv: Link the windows PNG format to the X image/png format. --- dlls/winex11.drv/clipboard.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b634451..22445d7 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -293,6 +293,7 @@ static WINE_CLIPFORMAT ClipFormats[] = /* Maps X properties to Windows formats */ static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; static const WCHAR wszGIF[] = {'G','I','F',0}; +static const WCHAR wszPNG[] = {'P','N','G',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { @@ -303,6 +304,7 @@ static const struct { wszRichTextFormat, XATOM_text_rtf }, { wszRichTextFormat, XATOM_text_richtext }, { wszGIF, XATOM_image_gif }, + { wszPNG, XATOM_image_png }, { wszHTMLFormat, XATOM_text_html }, }; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b11e6a1..03d7307 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -635,6 +635,7 @@ enum x11drv_atoms XATOM_XdndTypeList, XATOM_WCF_DIB, XATOM_image_gif, + XATOM_image_png, XATOM_text_html, XATOM_text_plain, XATOM_text_rtf, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 41c866c..924dc66 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -172,6 +172,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "XdndTypeList", "WCF_DIB", "image/gif", + "image/png", "text/html", "text/plain", "text/rtf",

1 0

Vincent Povirk : ole32: Add support for rendering HENHMETAFILE clipboard objects.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 51385a98ccaaf0fa0d98ceeb9e0d0b422ef5be9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51385a98ccaaf0fa0d98ceeb9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 19 14:26:48 2009 -0500 ole32: Add support for rendering HENHMETAFILE clipboard objects. --- dlls/ole32/clipboard.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 81231aa..208645e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -744,6 +744,30 @@ static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL * return hr; } +static HRESULT get_data_from_enhmetafile(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) +{ + HENHMETAFILE copy; + HRESULT hr; + FORMATETC mem_fmt; + STGMEDIUM med; + + *mem = NULL; + + mem_fmt = *fmt; + mem_fmt.tymed = TYMED_ENHMF; + + hr = IDataObject_GetData(data, &mem_fmt, &med); + if(FAILED(hr)) return hr; + + copy = CopyEnhMetaFileW(med.u.hEnhMetaFile, NULL); + if(copy) *mem = (HGLOBAL)copy; + else hr = E_FAIL; + + ReleaseStgMedium(&med); + + return hr; +} + /*********************************************************************** * render_format * @@ -773,6 +797,10 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { hr = get_data_from_global(data, fmt, &clip_data); } + else if(fmt->tymed & TYMED_ENHMF) + { + hr = get_data_from_enhmetafile(data, fmt, &clip_data); + } else { FIXME("Unhandled tymed %x\n", fmt->tymed);

1 0

Detlef Riekenberg : winex11: Get rid of glext.h in remaining locations.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: a30624143a633be225f724736dd042023bcc2717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30624143a633be225f724736… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 19 16:00:37 2009 +0200 winex11: Get rid of glext.h in remaining locations. --- configure | 3 +-- configure.ac | 2 +- dlls/winex11.drv/opengl.c | 3 --- include/config.h.in | 3 --- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure b/configure index fb5ef54..1142c59 100755 --- a/configure +++ b/configure @@ -11317,8 +11317,7 @@ fi - -for ac_header in GL/gl.h GL/glx.h GL/glext.h GL/glu.h +for ac_header in GL/gl.h GL/glx.h GL/glu.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 diff --git a/configure.ac b/configure.ac index bef311e..356f6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -850,7 +850,7 @@ then opengl_msg="" if test "x$with_opengl" != "xno" then - AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h GL/glu.h,,, + AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glu.h,,, [#ifdef HAVE_GL_GLX_H # include <GL/glx.h> #endif]) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index f1557b6..b2cf82a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -48,9 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); #ifdef HAVE_GL_GLX_H # include <GL/glx.h> #endif -#ifdef HAVE_GL_GLEXT_H -# include <GL/glext.h> -#endif #include "wine/wgl.h" diff --git a/include/config.h.in b/include/config.h.in index c113fcb..99ecae3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -222,9 +222,6 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID -/* Define to 1 if you have the <GL/glext.h> header file. */ -#undef HAVE_GL_GLEXT_H - /* Define to 1 if you have the <GL/glu.h> header file. */ #undef HAVE_GL_GLU_H

1 0

André Hentschel : documentation: README. de spelling fixes.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: fcc622030a10142bddf176f4c1dce08cb012f2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc622030a10142bddf176f4c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 19 17:20:06 2009 +0200 documentation: README.de spelling fixes. --- documentation/README.de | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 332ab88..0d7414e 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -111,9 +111,9 @@ Mit ./configure --help k die Kompilierung anzeigen lassen. Um mit Hilfe einer Patch-Datei auf ein neueres Release zu aktualisieren, -wechsen Sie erst mit cd in das Wurzelverzeichnis dieses Releases (das, -welches diese README-Datei enth�lt). Geben Sie dann "make clean" ein -und patchen Sie das Release mit dem Kommando: +wechseln Sie erst mit cd in das Wurzelverzeichnis dieses Releases (eins +�ber dem, welches diese README-Datei enth�lt). Geben Sie dann +"make clean" ein und patchen Sie das Release mit dem Kommando: bunzip2 -c Patch-Datei | patch -p1 @@ -145,7 +145,7 @@ Datei angeben oder nur einen Dateinamen. Beispiel: Um Notepad auszuf�hren: - wine notepad (den Suchpfad, der in der Konfiguartions-Datei + wine notepad (den Suchpfad, der in der Konfigurations-Datei wine notepad.exe angegeben wurde, benutzend) wine c:\\windows\\notepad.exe (die Dateinamen-Syntax von DOS benutzend)

1 0

Alexandre Julliard : transl: Add the Lithuanian language.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: d1c64d998422d7075b9fbcac767760110599da6e URL: http://source.winehq.org/git/tools.git/?a=commit;h=d1c64d998422d7075b9fbcac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 17:40:10 2009 +0200 transl: Add the Lithuanian language. --- transl/scripts/conf/027:00 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/transl/scripts/conf/027:00 b/transl/scripts/conf/027:00 new file mode 100644 index 0000000..dc243c5 --- /dev/null +++ b/transl/scripts/conf/027:00 @@ -0,0 +1 @@ +Lithuanian

1 0

Alexandre Julliard : make-winetest: Update the translations status after building winetest.exe.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: 22fce667e5c4fe9fcc4651bb694642e86d75395c URL: http://source.winehq.org/git/tools.git/?a=commit;h=22fce667e5c4fe9fcc4651bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 13:23:57 2009 +0200 make-winetest: Update the translations status after building winetest.exe. --- winetest/make-winetest | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 4fcd05b..4547c0a 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -47,6 +47,8 @@ done destdir="/home/winehq/opt/winetest/builds" desturl="http://test.winehq.org/builds" servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" +toolsdir="/home/winehq/opt/git-tools" +transldir="/home/winehq/opt/source/transl" mingw32=i586-mingw32msvc mingw64=x86_64-pc-mingw32 @@ -74,7 +76,7 @@ umask 022 test -d build-native || (mkdir build-native && cd build-native && - ../wine/configure --without-x --without-freetype) || exit + ../wine/configure --enable-win64 --without-x --without-freetype) || exit (cd build-native && make depend && make tools) || exit @@ -125,6 +127,26 @@ umask 022 echo "winetest64-$head.exe built successfully." + # update the translations status + + 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/summary.pl ./work "$toolsdir/transl/scripts" + for i in work/new-langs/* + do + if [ -f "$i" ] + then + echo "note: New language:" `basename "$i"` | tee -a work/run.log + fi + done + mv -f $transldir/langs $transldir/langs.old + mv -f $transldir/dumps $transldir/dumps.old + mv -f work/langs $transldir/langs + mv -f work/dumps $transldir/dumps + mv -f work/run.log $transldir/dumps/run.log + rm -rf $transldir/langs.old $transldir/dumps.old + ) >$logfile 2>&1 && rm -f $logfile # if the log file is still here, something failed

1 0

Alexandre Julliard : transl: Always run make to build the . res files so that dependencies are updated.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: c033d1e2542ed0c4043a7bf9b530603e6cf48471 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c033d1e2542ed0c4043a7bf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 14:17:28 2009 +0200 transl: Always run make to build the .res files so that dependencies are updated. --- transl/scripts/checkmakefile.pl | 71 ++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 41 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 487aa0d..5c5d71c 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -16,6 +16,7 @@ sub log_string sub mycheck { + my($dir) = shift(@_); my($name) = shift(@_); if ($name =~ m/version.rc$/) { @@ -24,59 +25,48 @@ sub mycheck } if (not exists $ENV{"NOVERBOSE"}) { - print "*** ".$name."\n"; + print "*** $dir$name\n"; } # files in dlls/ are compiled with __WINESRC__ my($defs) = ""; - $defs = "-D__WINESRC__" if ($name =~ m,^${srcdir}/?dlls,); + $defs = "-D__WINESRC__" if ($dir =~ m,^dlls,); - log_string("*** $name [$defs]"); + log_string("*** $dir$name [$defs]"); - my($respath) = dirname($name); - my $srcincl = "-I$respath -I$srcdir/include -I$srcdir/dlls/user32"; + my $srcincl = "-I$srcdir/$dir -I$srcdir/include"; (my $objincl = $srcincl) =~ s!I$srcdir!I$objdir!g; - $ret = system("$wrc $srcincl $objincl --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); + my $norm_fn = $dir.$name; + $norm_fn =~ s/\.rc$//; + $norm_fn =~ s/[^a-zA-Z0-9]/-/g; + (my $target = $name) =~ s/.rc$/.res/; + $ret = system("make -C $objdir/$dir -s $target 2>>$workdir/run.log && cp $objdir/$dir/$target $workdir/dumps/res/$norm_fn.res"); + if ($ret) + { + log_string "make -C $objdir/$dir -s $target 2>>$workdir/run.log && cp $objdir/$dir/$target $workdir/dumps/res/$norm_fn.res"; + print "!!!!!!! return value: $ret\n"; + exit 1; + } + + $ret = system("$wrc $srcincl $objincl --verify-translation $defs $srcdir/$dir$name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); if ($ret == 0) { - $name =~ s,$srcdir/,,; - if ($name eq "dlls/kernel32/kernel.rc") { - system("$scriptsdir/ver.pl \"$name\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"); + if ("$dir$name" eq "dlls/kernel32/kernel.rc") { + system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"); log_string("*** $name [$defs] (locale run)"); - system("$scriptsdir/ver.pl \"$name\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"); } else { - system("$scriptsdir/ver.pl \"$name\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"); - } - $norm_fn= $name; - $norm_fn =~ s/\.rc$//; - $norm_fn =~ s/[^a-zA-Z0-9]/-/g; - $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"; - exit 1; + system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"); } } else { - print "!!!!!!! return value: ".$ret."\n"; + log_string "$wrc $srcincl $objincl --verify-translation $defs $srcdir/$dir$name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"; + print "!!!!!!! return value: $ret\n"; exit 1; } } -# if PREPARE_TREES is 1 in the config file this will make the *.res file to make -# sure all the dependancies are built. -sub prepare_file -{ - my($dir) = shift (@_); - my($file) = shift (@_); - $file =~ s/\.rc/\.res/; - if (($ret = system("make -C \"$dir\" \"$file\" >/dev/null 2>>$workdir/run.log")) != 0) - { - print "!!!!!!! make return value: ".$ret."\n"; - } -} - srand(); # Parse config file if (-f config) @@ -137,18 +127,18 @@ if (!@makefiles) # parse the makefiles foreach my $makefile (@makefiles) { - if ($makefile =~ m,programs/winetest/, || $makefile =~ m,/tests/,) + next unless $makefile =~ m,^$srcdir/(.*/)Makefile.in$,; + my $path = $1; + if ($path eq "programs/winetest/" || $path =~ m,/tests/$,) { if (not exists $ENV{"NOVERBOSE"}) { - print "--- Ignoring: ".$makefile."\n"; + print "--- Ignoring: ".$path."Makefile.in\n"; } next; } - open(MAKEFILE, "<$makefile"); - $makefile =~ m,^(.*/)[^/]*$,; - $path = $1; + open(MAKEFILE, "<$makefile") or die "cannot open $makefile"; while (<MAKEFILE>) { last if m/EXTRARCFLAGS\s*=.*res16/; # 16-bit resources not supported @@ -166,8 +156,7 @@ foreach my $makefile (@makefiles) { next if ($_ eq ""); s/\s//; - &prepare_file("$path", "$_") if ($CONFIG{"PREPARE_TREES"} == 1); - &mycheck("$path$_"); + &mycheck($path,$_); } last; }

1 0

Alexandre Julliard : transl: Terminate the scripts if an error occurs.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: 865952c2a9b40acae0faa07a1115e4957660f550 URL: http://source.winehq.org/git/tools.git/?a=commit;h=865952c2a9b40acae0faa07a… Author: Alexandre Julliard <julliard(a)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; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009