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

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

Maik Schulz : Website: German translation of release 1.1.24 news item
by Maik Schulz 20 Jun '09

20 Jun '09

Module: website Branch: master Commit: 68ee5992f6e4aaa26650edf13ec555ca7fb3a72e URL: http://source.winehq.org/git/website.git/?a=commit;h=68ee5992f6e4aaa26650ed… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Jun 20 13:28:48 2009 +0200 Website: German translation of release 1.1.24 news item --- news/de/2009061901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009061901.xml b/news/de/2009061901.xml new file mode 100644 index 0000000..c68f398 --- /dev/null +++ b/news/de/2009061901.xml @@ -0,0 +1,17 @@ +<news> +<date>19. Juni 2009</date> +<title>Wine 1.1.24 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von freedesktop Dateitypzuordnungen.</li> + <li>Unterstützung für 64-bit Exception Handling.</li> + <li>Verbesserte ARB Shader.</li> + <li>Fehlerbehebungen am FBO-Modus.</li> + <li>Viele Verbesserungen an listview.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.24.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.24
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: website Branch: master Commit: 804d1cc9b760f05511888fd44e183bf8c1e65b2d URL: http://source.winehq.org/git/website.git/?a=commit;h=804d1cc9b760f05511888f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:55:45 2009 +0200 Wine release 1.1.24 --- news/en/2009061901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009061901.xml b/news/en/2009061901.xml new file mode 100644 index 0000000..8881cff --- /dev/null +++ b/news/en/2009061901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 19, 2009</date> +<title>Wine 1.1.24 Released</title> +<body> + The Wine development release 1.1.24 is now available. + <a href="{$root}/announce/1.1.24">What's new</a> in this release: +<ul> + <li>Support for freedesktop file associations.</li> + <li>Support for exception handling on 64-bit.</li> + <li>Improved ARB shaders.</li> + <li>Fixes for the FBO mode.</li> + <li>Many listview improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.24.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 675e6e93b1d2b4555d05e311764510abf763d21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=675e6e93b1d2b4555d05e3117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:49:15 2009 +0200 Release 1.1.24. --- ANNOUNCE | 1131 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 526 insertions(+), 625 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=675e6e93b1d2b4555d05e…

1 0

Tag wine-1.1.24 : Alexandre Julliard : Release 1.1.24
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: refs/tags/wine-1.1.24 Tag: 50bd0e4bf9d677613e022750edcba7268ed4480b URL: http://source.winehq.org/git/wine.git/?a=tag;h=50bd0e4bf9d677613e022750edcb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:49:16 2009 +0200 Release 1.1.24

1 0

Alexandre Julliard : wine_release: Build makedep first to avoid warnings.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 291bf49abea59c800bf30f1eb88c46e217a165ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=291bf49abea59c800bf30f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 15 13:53:13 2009 +0200 wine_release: Build makedep first to avoid warnings. --- wine_release | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/wine_release b/wine_release index 0375494..b5fd54c 100755 --- a/wine_release +++ b/wine_release @@ -65,6 +65,7 @@ then # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype + cd tools && make makedep manpages="\ loader/wine.man \

1 0

Alexandre Julliard : Import the translati on checking tool written by Mikołaj Zalewski.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: cdef0966d91b0e3a579570a6d9a8edc33c7aa7d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cdef0966d91b0e3a579570a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 14:54:48 2009 +0200 Import the translation checking tool written by Mikołaj Zalewski. ---

1 0

Mikolaj Zalewski : inform about warnings on the language page
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 132b5b741bc019a914bb7fe4de348949656e0eb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=132b5b741bc019a914bb7fe4… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Dec 7 00:44:46 2008 +0100 inform about warnings on the language page --- php/lang.php | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/php/lang.php b/php/lang.php index 167cf2f..a743deb 100644 --- a/php/lang.php +++ b/php/lang.php @@ -8,23 +8,36 @@ $file = fopen("$DATAROOT/langs/$lang", "r"); $transl = array(); $notransl = array(); $partial = array(); +$curr_file = ""; while ($line = fgets($file, 4096)) { if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { + $curr_file = $m[2]; if ($m[1] == "NONE") { - $notransl[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); continue; } if ($m[4]>0 || $m[5]>0) { - $partial[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); continue; } - $transl[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); + } + if (preg_match(",$curr_file: Warning: ,", $line, $m)) + { + if (array_key_exists($curr_file, $transl)) + { + $partial[$curr_file] = $transl[$curr_file]; + unset($transl[$curr_file]); + } + + if (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ + $partial[$curr_file][3]++; } if (preg_match("/LOCALE ([0-9a-f]{3}:[0-9a-f]{2}) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { @@ -54,7 +67,10 @@ function dump_table($table) echo "<tr><th>File name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; foreach ($table as $key => $value) { - echo "<tr><td>".gen_resfile_a($lang, $value[3]).$key."</a></td>"; + $extra = ""; + if ($value[3] > 0) + $extra = "(<img src=\"img/icon-warning.png\" height=\"16\"> warnings: ".$value[3].")"; + echo "<tr><td>".gen_resfile_a($lang, $key).$key."</a> $extra</td>"; echo "<td>".$value[0]."</td>"; echo "<td>".$value[1]."</td>"; echo "<td>".$value[2]."</td>";

1 0