June 2009 - Wine-commits - list.winehq.org

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

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

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 : 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

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

Nicolas Le Cam : shell32/tests: Fix a typo.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: ce78a66d8ed7cc547b7d468bbc514a246e976900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce78a66d8ed7cc547b7d468bb… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 20 12:49:12 2009 +0200 shell32/tests: Fix a typo. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7487376..d67c77d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1949,7 +1949,7 @@ START_TEST(shlfolder) if(pSHCreateShellItem) test_SHCreateShellItem(); else - win_skip("test_SHCreateShellItem not present\n"); + win_skip("SHCreateShellItem not present\n"); OleUninitialize(); }

1 0

Alexandre Julliard : wine_release: Don' t change directories when building makedep.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: b8591704cf2f7f0ffa6f25273356beadaf1029f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8591704cf2f7f0ffa6f2527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 19:31:26 2009 +0200 wine_release: Don't change directories when building makedep. Run mysql last in case since it should only be done once. --- wine_release | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wine_release b/wine_release index b5fd54c..11680a0 100755 --- a/wine_release +++ b/wine_release @@ -38,9 +38,6 @@ git clone -l -s -n git/wine.git wine-$version rm -f wine ln -s wine-$version wine -# add version to bugzilla table -echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql - # make cross reference database for LXR # note that we must have write permission in this directory echo "==== UPDATING LXR ====" @@ -65,7 +62,7 @@ then # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype - cd tools && make makedep + (cd tools && make makedep) manpages="\ loader/wine.man \ @@ -98,4 +95,7 @@ fi rm -rf .git +# add version to bugzilla table +echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql + # end

1 0

Alexandre Julliard : transl: Add config parameters for build tree and scripts directory.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: 04bc7e73ac4d03f9a1c201e7cc2d846e6b1858cf URL: http://source.winehq.org/git/tools.git/?a=commit;h=04bc7e73ac4d03f9a1c201e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 12:38:41 2009 +0200 transl: Add config parameters for build tree and scripts directory. --- transl/scripts/Master.sh | 12 ++++++------ transl/scripts/checkmakefile.pl | 26 +++++++++++++++----------- transl/scripts/config-example | 6 ++++++ transl/scripts/summary.pl | 7 ++++--- transl/scripts/ver.pl | 15 ++++++++------- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index ee7a27c..1c59744 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -27,12 +27,12 @@ if [ "$PREPARE_TREES" -eq 1 ]; then echo -n "Preparing tree(s)..." fi if [ ! -f "$WRCROOT/Makefile" ]; then - $WRCROOT/configure + (cd $WRCROOT && $SOURCEROOT/configure) fi make -C "$WRCROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in wrc tree failed" make -C "$WRCROOT" tools >/dev/null 2>>"$WORKDIR/run.log" || die "make tools in wrc tree failed" - make -C "$SOURCEROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed" - make -C "$SOURCEROOT" include/stdole2.tlb >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed" + make -C "$BUILDROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in build tree failed" + make -C "$BUILDROOT" include/stdole2.tlb >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in build tree failed" if [ "x$NOVERBOSE" = "x" ]; then echo " done" fi @@ -48,8 +48,8 @@ mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs # Analyze all the Makefiles -find $SOURCEROOT/ -name Makefile.in -exec ./checkmakefile.pl \{\} \; -./summary.pl "$WORKDIR" +find $SOURCEROOT/ -name Makefile.in -exec $SCRIPTSDIR/checkmakefile.pl \{\} \; +$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" # Check for a new languages for i in $WORKDIR/new-langs/*; do @@ -68,7 +68,7 @@ mv -f $WORKDIR/langs $DESTDIR/langs mv -f $WORKDIR/dumps $DESTDIR/dumps cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log -rsync -r --delete conf $DESTDIR +rsync -r --delete $SCRIPTSDIR/conf $DESTDIR # Deleting can take a bit longer so we do it after the new version is set up rm -Rf $DESTDIR/langs.old diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index c13c31f..e54c434 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -29,26 +29,28 @@ sub mycheck # files in dlls/ are compiled with __WINESRC__ my($defs) = ""; - $defs = "-D__WINESRC__" if ($name =~ m,^${winedir}/?dlls,); + $defs = "-D__WINESRC__" if ($name =~ m,^${srcdir}/?dlls,); log_string("*** $name [$defs]"); my($respath) = dirname($name); - $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); + my $srcincl = "-I$respath -I$srcdir/include -I$srcdir/dlls/user32"; + (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"); if ($ret == 0) { - $name =~ s,$winedir,,; + $name =~ s,$srcdir/,,; if ($name eq "dlls/kernel32/kernel.rc") { - system("./ver.pl \"$name\" \"$workdir\" nonlocale <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$name\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"); log_string("*** $name [$defs] (locale run)"); - system("./ver.pl \"$name\" \"$workdir\" locale <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$name\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"); } else { - system("./ver.pl \"$name\" \"$workdir\" normal <$workdir/ver.txt"); + 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 -I$respath -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); + $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"; @@ -98,11 +100,13 @@ while (<CONFIG>) } close(CONFIG); -$winedir = $CONFIG{"SOURCEROOT"}."/"; -$wrc = $CONFIG{"WRCROOT"}."/tools/wrc/wrc"; -$workdir = $CONFIG{"WORKDIR"}."/"; +$srcdir = $CONFIG{"SOURCEROOT"}; +$objdir = $CONFIG{"BUILDROOT"} || $srcdir; +$wrc = ($CONFIG{"WRCROOT"} || $objdir) . "/tools/wrc/wrc"; +$workdir = $CONFIG{"WORKDIR"}; +$scriptsdir = $CONFIG{"SCRIPTSDIR"} || "."; -if ($winedir eq "/" || $wrc eq "/tools/wrc/wrc" || $workdir eq "/") +if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") { die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } diff --git a/transl/scripts/config-example b/transl/scripts/config-example index b8068dd..47cc4c5 100644 --- a/transl/scripts/config-example +++ b/transl/scripts/config-example @@ -3,9 +3,15 @@ # Path to the Wine source tree to analyze SOURCEROOT=/path/to/wine-src +# Path to the Wine build tree (if different from SOURCEROOT) +BUILDROOT=/path/to/wine-src + # Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src +# Directory containing the various scripts +SCRIPTSDIR=. + # The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. DESTDIR=../php diff --git a/transl/scripts/summary.pl b/transl/scripts/summary.pl index 377fea3..f1290b5 100755 --- a/transl/scripts/summary.pl +++ b/transl/scripts/summary.pl @@ -3,9 +3,10 @@ # Helper script - create a summary for each language about how # many resources are translated -die "This helper script take one argument" unless ($#ARGV == 0); +die "This helper script takes two arguments" unless ($#ARGV == 1); $workdir = $ARGV[0]; +$scriptsdir = $ARGV[1]; sub collapse { my($name) = shift @_; @@ -13,7 +14,7 @@ sub collapse { $base_name =~ s/:[0-9a-f]{2}/:00/; if (not exists $tab_should_collapse{$name}) { - open(NAMEFILE, "<conf/$base_name"); + open(NAMEFILE, "<$scriptsdir/conf/$base_name"); $content = <NAMEFILE>; close(NAMEFILE); if ($content =~ /\[ignore-sublang\]/) { @@ -27,7 +28,7 @@ sub collapse { return $name; } -opendir(DIR, "conf"); +opendir(DIR, "$scriptsdir/conf"); @files = grep(!/^\./, readdir(DIR)); closedir(DIR); diff --git a/transl/scripts/ver.pl b/transl/scripts/ver.pl index bafd8bb..9b7f289 100755 --- a/transl/scripts/ver.pl +++ b/transl/scripts/ver.pl @@ -3,11 +3,12 @@ # Helper script - parse the results of wrc --verify-translation # and store then in $2/langs/* and $2/dumps/* -die "This helper script takes three arguments" unless ($#ARGV == 2); +die "This helper script takes at least three arguments" unless ($#ARGV >= 2); $filename = $ARGV[0]; $workdir = $ARGV[1]; $mode = $ARGV[2]; +$scriptsdir = $ARGV[3] || "."; $type=-1; $types[1] = "CURSOR"; @@ -64,7 +65,7 @@ sub collapse { $base_name =~ s/:[0-9a-f]{2}/:00/; if (not exists $tab_should_collapse{$name}) { - open(NAMEFILE, "<conf/$base_name"); + open(NAMEFILE, "<$scriptsdir/conf/$base_name"); $content = <NAMEFILE>; close(NAMEFILE); if ($content =~ /\[ignore-sublang\]/) { @@ -204,9 +205,9 @@ foreach $lang (@file_langs) { $basic_lang = $lang; $basic_lang =~ s/:[0-9a-f]{2}/:00/; - if (-e "conf/$lang") { + if (-e "$scriptsdir/conf/$lang") { open(LANGOUT, ">>$workdir/langs/$lang"); - } elsif (-e "conf/$basic_lang") { + } elsif (-e "$scriptsdir/conf/$basic_lang") { open(LANGOUT, ">>$workdir/langs/$basic_lang"); } else { # print("Ignoring locale $lang\n"); @@ -214,7 +215,7 @@ foreach $lang (@file_langs) print LANGOUT "LOCALE $lang $filename ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; $suffix = "#locale$lang"; } else { - if (-e "conf/$lang") { + if (-e "$scriptsdir/conf/$lang") { open(LANGOUT, ">>$workdir/langs/$lang"); } else { open(LANGOUT, ">>$workdir/new-langs/$lang"); @@ -255,7 +256,7 @@ foreach $lang (@file_langs) if (!($mode eq "locale")) { - opendir(DIR, "conf"); + opendir(DIR, "$scriptsdir/conf"); @files = grep(!/^\./, readdir(DIR)); closedir(DIR); foreach $lang (@files) { @@ -269,4 +270,4 @@ if (!($mode eq "locale")) close(LANGOUT); } } -} \ No newline at end of file +}

1 0

Alexandre Julliard : transl: Make checkmakefile. pl accept config parameters from the command line too.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: db12963b683c239d6d45c9520d66d769730e4d5e URL: http://source.winehq.org/git/tools.git/?a=commit;h=db12963b683c239d6d45c952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 12:59:25 2009 +0200 transl: Make checkmakefile.pl accept config parameters from the command line too. Also make it automatically process all the makefiles if no argument is specified. --- transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 113 +++++++++++++++++++++++++------------- 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 1c59744..c85cd7b 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 -find $SOURCEROOT/ -name Makefile.in -exec $SCRIPTSDIR/checkmakefile.pl \{\} \; +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" $SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" # Check for a new languages diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index e54c434..fd919c9 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -75,65 +75,100 @@ sub prepare_file } } -if ($ARGV[0] =~ m,programs/winetest/, || $ARGV[0] =~ m,/tests/,) -{ - if (not exists $ENV{"NOVERBOSE"}) - { - print "--- Ignoring: ".$ARGV[0]."\n"; - } - exit; -} - srand(); # Parse config file -open(CONFIG, "<config"); -while (<CONFIG>) +if (-f config) { - if (m/^([A-Z_]+)=([^\s]+)\s*$/) + open(CONFIG, "<config"); + while (<CONFIG>) { - $CONFIG{$1} = $2; + if (m/^([A-Z_]+)=([^\s]+)\s*$/) + { + $CONFIG{$1} = $2; + } + elsif (!(m/^#/ || m/^$/)) + { + print("checkmakefile.pl: Can't parse config line: $_\n"); + } } - elsif (!(m/^#/ || m/^$/)) + close(CONFIG); +} + +while (@ARGV && $ARGV[0] =~ /^-/) +{ + my $opt = shift @ARGV; + if ($opt eq "-S") { $srcdir = shift @ARGV; } + elsif ($opt eq "-T") { $objdir = shift @ARGV; } + elsif ($opt eq "-s") { $scriptsdir = shift @ARGV; } + elsif ($opt eq "-t") { $toolsdir = shift @ARGV; } + elsif ($opt eq "-w") { $workdir = shift @ARGV; } + else { - print("checkmakefile.pl: Can't parse config line: $_\n"); + print STDERR "Usage: $0 [options] [makefiles]\n\n"; + print STDERR " -S dir Set the top of the Wine source tree\n"; + print STDERR " -T dir Set the top of the Wine build tree\n"; + print STDERR " -t dir Set the Wine tools directory\n"; + print STDERR " -s dir Set the scripts directory\n"; + print STDERR " -w dir Set the work directory\n"; + exit 1; } } -close(CONFIG); -$srcdir = $CONFIG{"SOURCEROOT"}; -$objdir = $CONFIG{"BUILDROOT"} || $srcdir; -$wrc = ($CONFIG{"WRCROOT"} || $objdir) . "/tools/wrc/wrc"; -$workdir = $CONFIG{"WORKDIR"}; -$scriptsdir = $CONFIG{"SCRIPTSDIR"} || "."; +$srcdir ||= $CONFIG{"SOURCEROOT"}; +$objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; +$toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; +$workdir ||= $CONFIG{"WORKDIR"}; +$scriptsdir ||= $CONFIG{"SCRIPTSDIR"} || "."; +$wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") { die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } -# parse the makefile -open(MAKEFILE, "<".$ARGV[0]); -$ARGV[0] =~ m,^(.*/)[^/]*$,; -$path = $1; -while (<MAKEFILE>) +(a)makefiles = @ARGV; +if (!@makefiles) { - if (m/^RC_SRCS *=/) + @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); +} + +# parse the makefiles +foreach my $makefile (@makefiles) +{ + if ($makefile =~ m,programs/winetest/, || $makefile =~ m,/tests/,) { - while (m/\\$/) + if (not exists $ENV{"NOVERBOSE"}) { - chop; - chop; - $_ .= <MAKEFILE>; + print "--- Ignoring: ".$makefile."\n"; } - m/^RC_SRCS *=(.*)$/; - @file = split(/ /, $1); - foreach (@file) + next; + } + + open(MAKEFILE, "<$makefile"); + $makefile =~ m,^(.*/)[^/]*$,; + $path = $1; + while (<MAKEFILE>) + { + last if m/EXTRARCFLAGS\s*=.*res16/; # 16-bit resources not supported + if (m/^RC_SRCS *=/) { - next if ($_ eq ""); - s/\s//; - &prepare_file("$path", "$_") if ($CONFIG{"PREPARE_TREES"} == 1); - &mycheck("$path$_"); + while (m/\\$/) + { + chop; + chop; + $_ .= <MAKEFILE>; + } + m/^RC_SRCS *=(.*)$/; + @file = split(/ /, $1); + foreach (@file) + { + next if ($_ eq ""); + s/\s//; + &prepare_file("$path", "$_") if ($CONFIG{"PREPARE_TREES"} == 1); + &mycheck("$path$_"); + } + last; } - exit; } + close MAKEFILE; }

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