July 2018 - Wine-commits - list.winehq.org

Julian Rüger : German translation for release 3.0.2
by Jeremy Newman 10 Jul '18

10 Jul '18

Module: website Branch: master Commit: 1a9bef00ace69e878adc170c2a62de607f25872a URL: https://source.winehq.org/git/website.git/?a=commit;h=1a9bef00ace69e878adc1… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 10 14:46:36 2018 +0200 German translation for release 3.0.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018062601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018062601.xml b/news/de/2018062601.xml new file mode 100644 index 0000000..9a0d812 --- /dev/null +++ b/news/de/2018062601.xml @@ -0,0 +1,12 @@ +<news> +<date>26. Juni 2018</date> +<title>Wine 3.0.2 freigegeben</title> +<body> +<p> Die Wartungsversion 3.0.2 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.0.2">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 10 Jul '18

10 Jul '18

Module: website Branch: master Commit: 48fb772078f075c0fbadae7612cddcf47e752822 URL: https://source.winehq.org/git/website.git/?a=commit;h=48fb772078f075c0fbada… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 13:38:39 2018 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Francois Gouget : testbot/build: Remove support for the old Build.pl parameters.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: def79fd13a535c9d9d02b3b9c57d71f4da2b9889 URL: https://source.winehq.org/git/tools.git/?a=commit;h=def79fd13a535c9d9d02b3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:46 2018 +0200 testbot/build: Remove support for the old Build.pl parameters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 1a69669..da14583 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -193,19 +193,10 @@ my %AllTargets; map { $AllTargets{$_} = 1 } qw(exe32 exe64); my ($Usage, $PatchFile, $TargetList); -my $IgnoreNext = 0; # FIXME Backward compatibility while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg =~ /^patch(?:dlls|programs)$/) - { - $IgnoreNext ||= 1; # Ignore this legacy parameter - } - elsif ($IgnoreNext == 1) - { - $IgnoreNext = 2; # Ignore this legacy parameter - } - elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + if ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; last;

1 0

Francois Gouget : testbot/build: Avoid an undefined $Action error in WineTest.pl.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: eb6ac033804ceb256c222bd263ee523625d8ad5c URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb6ac033804ceb256c222bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:35:04 2018 +0200 testbot/build: Avoid an undefined $Action error in WineTest.pl. This would only happen if running WineTest.pl from the command line, to get the usage message for instance. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 2b2ea2b..5ef8e61 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -315,9 +315,9 @@ if (!defined $Usage) $Usage = 2; } - if (!defined $FileName and $Action eq "build") + if (!defined $FileName and ($Action || "") eq "build") { - Error "you must provide a patch file\n"; + Error "you must provide a patch to test\n"; $Usage = 2; } }

1 0

Francois Gouget : testbot/web: Add a border around the link to hide the current log.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: a9eef3efc102d28b1d478218a7d7c468f8de50ee URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9eef3efc102d28b1d47821… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:35:31 2018 +0200 testbot/web: Add a border around the link to hide the current log. This helps make it clearer which log is being shown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++++++-- testbot/web/WineTestBot.css | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e7e53d2..532d76d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -338,8 +338,12 @@ sub GenerateMoreInfoLink($$$;$) } $Url .= "#k" . uri_escape($LinkKey); - print "<div class='TaskMoreInfoLink'><a href='", - $self->CGI->escapeHTML($Url), "'>$Action $Label</a></div>\n"; + my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; + if ($Action eq "Hide") + { + $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; + } + print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } sub GenerateBody($) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 593c38f..0055ec0 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -310,6 +310,12 @@ h2 margin-right: 2em; } +.TaskMoreInfoSelected +{ + border: 1px solid #a50d0d; + padding: 2px; +} + .LogDllName { font-weight: bold;

1 0

Francois Gouget : testbot/web: Also detect and highlight the TestBot error messages.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: 35dc4c4148b815d7fbcda4f724d79dc675fcac21 URL: https://source.winehq.org/git/tools.git/?a=commit;h=35dc4c4148b815d7fbcda4f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:03 2018 +0200 testbot/web: Also detect and highlight the TestBot error messages. This means calling GetHtmlLine() to highlight and escape the error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ testbot/web/JobDetails.pl | 4 ++-- testbot/web/WineTestBot.css | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bccf30d..98fe9cf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -430,6 +430,10 @@ sub GetLogLineCategory($) { return "error"; } + if ($Line =~ /^BotError:/) + { + return "boterror"; + } if ($Line =~ /^\+ \S/ or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or # Build messages diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 532d76d..3a5b307 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -250,7 +250,7 @@ sub GetHtmlLine($$$) my ($self, $FullLog, $Line) = @_; my $Category = GetLogLineCategory($Line); - return undef if ($Category ne "error" and !$FullLog); + return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) @@ -481,7 +481,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->escapeHTML($Line), "\n"; + print $self->GetHtmlLine(1, $Line), "\n"; } close($ErrFile); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 0055ec0..ae20382 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -377,6 +377,7 @@ pre .log-skip { color: blue; } .log-todo { color: #d08000; } .log-error { color: red; } +.log-boterror { color: #cc0052; } a.title { color:inherit; text-decoration: none; }

1 0

Francois Gouget : testbot/web: Also highlight the 'unknown target' make errors.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: 4b50aec2f0d3d3a5f4f3f612575c02cdf35fc2c3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b50aec2f0d3d3a5f4f3f61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:08 2018 +0200 testbot/web: Also highlight the 'unknown target' make errors. In case a makefile patch gets things wrong (or there is a TestBot bug). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 98fe9cf..0ef9609 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -423,6 +423,7 @@ sub GetLogLineCategory($) $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors

1 0

Francois Gouget : testbot/web: Tweak the 'Show full log' link labels.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: f49339ecdfeaa72640886c983ee3c266e377fc03 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f49339ecdfeaa72640886c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:14 2018 +0200 testbot/web: Tweak the 'Show full log' link labels. Parts of the log may already be shown so make it clearer that this is to show all of it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3a5b307..28601d0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -300,7 +300,7 @@ sub GenerateMoreInfoLink($$$;$) my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); - my $Action = "Show"; + my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) { my $MoreInfo = $self->{More}->{$Key};

1 0

Francois Gouget : testbot/build: Standardize some Build.pl and WineTest.pl messages.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: 5863db28e114a7dc81a8a409be0c2773ffaf3cb9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5863db28e114a7dc81a8a40… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:04 2018 +0200 testbot/build: Standardize some Build.pl and WineTest.pl messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a3cb170..1a69669 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -223,13 +223,13 @@ while (@ARGV) $PatchFile = "$DataDir/staging/$Arg"; if (!-r $PatchFile) { - Error "patch file '$Arg' is not readable\n"; + Error "'$Arg' is not readable\n"; $Usage = 2; } } else { - Error "the patch filename '$Arg' contains invalid characters\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1c43a9b..2b2ea2b 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -252,7 +252,7 @@ while (@ARGV) } else { - Error "invalid file name '$Arg'\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; }

1 0

Francois Gouget : testbot/web: Use IsValidFileName() to validate executable filenames.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: tools Branch: master Commit: f9b8b65011eff1959436a851962f024e53bba193 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f9b8b65011eff1959436a85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:22 2018 +0200 testbot/web: Use IsValidFileName() to validate executable filenames. Submit.pl should not have its own way to check that the executable filename is a valid Windows filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 38aa75f..cb6a124 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -484,7 +484,7 @@ sub Validate($) { if (($self->GetParam("FileType") eq "patchdlls" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) + !IsValidFileName($self->GetParam("TestExecutable"))) { $self->{ErrField} = "TestExecutable"; $self->{ErrMessage} = "Invalid test executable filename";

1 0