wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Francois Gouget : testbot/CheckForWinetestUpdate: Simplify a hashtable copy.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 3b435a98a044b78f452c78b6d3ece53c1baf6df7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3b435a98a044b78f452c78b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:56 2018 +0200 testbot/CheckForWinetestUpdate: Simplify a hashtable copy. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 21d2e15..a7d77f0 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -386,7 +386,7 @@ while (@ARGV) # Check parameters if (!defined $Usage) { - map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); + %OptTypes = %TaskTypes if (!%OptTypes); } if (defined $Usage) {

1 0

Francois Gouget : testbot/WineReconfig: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 97e626961cd55937d4c79485eb8b0305b3442df4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=97e626961cd55937d4c7948… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:48 2018 +0200 testbot/WineReconfig: Clean up the command line options. This separates the actions (updating, building, etc.) from the targets they apply to (the win32, wow32 and wow64 builds). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 113 +++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 43 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index e3f14e2..7772273 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -102,11 +102,8 @@ sub BuildTestAgentd() return 1; } -sub GitPull($) +sub GitPull() { - my ($Targets) = @_; - return 1 if (!$Targets->{update}); - InfoMsg "\nUpdating the Wine source\n"; system("cd '$DataDir/wine' && git pull"); if ($? != 0) @@ -129,7 +126,7 @@ sub BuildWine($$$$) { my ($Targets, $NoRm, $Build, $Extras) = @_; - return 1 if (!$Targets->{build} or !$Targets->{$Build}); + return 1 if (!$Targets->{$Build}); mkdir "$DataDir/build-$Build" if (!-d "$DataDir/build-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -148,6 +145,15 @@ sub BuildWine($$$$) return 1; } +sub UpdateWineBuilds($$) +{ + my ($Targets, $NoRm) = @_; + + return BuildWine($Targets, $NoRm, "win32", "") && + BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && + BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'"); +} + # # WinePrefix helpers @@ -207,11 +213,8 @@ sub UpdateAddOn($$$) return 0; } -sub UpdateAddOns($) +sub UpdateAddOns() { - my ($Targets) = @_; - return 1 if (!$Targets->{addons}); - my %AddOns; if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) { @@ -277,7 +280,7 @@ sub NewWinePrefix($$) { my ($Targets, $Build) = @_; - return 1 if (!$Targets->{wineprefix} or !$Targets->{$Build}); + return 1 if (!$Targets->{$Build}); InfoMsg "\nRecreating the $Build wineprefix\n"; SetupWineEnvironment($Build); @@ -296,6 +299,20 @@ sub NewWinePrefix($$) return 1; } +sub UpdateWinePrefixes($) +{ + my ($Targets) = @_; + + return NewWinePrefix($Targets, "win32") && + # The wow32 and wow64 wineprefixes: + # - Are essentially identical. + # - Must be created after both WoW builds have been updated. + # - Make it possible to run the wow32 and wow64 tests in separate + # prefixes, thus ensuring they don't interfere with each other. + NewWinePrefix($Targets, "wow64") && + NewWinePrefix($Targets, "wow32"); +} + # # Setup and command line processing @@ -305,15 +322,31 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(update addons build wineprefix win32 wow32 wow64); +map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); -my ($Usage, $TargetList, $NoRm); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $TargetList); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--no-rm") + if ($Arg eq "--update") { - $NoRm = 1; + $OptUpdate = 1; + } + elsif ($Arg eq "--build") + { + $OptBuild = 1; + } + elsif ($Arg eq "--no-rm") + { + $OptNoRm = 1; + } + elsif ($Arg eq "--addons") + { + $OptAddOns = 1; + } + elsif ($Arg eq "--wineprefix") + { + $OptWinePrefix = 1; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -342,6 +375,10 @@ while (@ARGV) my $Targets; if (!defined $Usage) { + if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) + { + $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; + } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); foreach my $Target (split /,/, $TargetList) { @@ -361,22 +398,24 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--no-rm] [--help] [TARGETS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; + print " [--help] [TARGETS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of targets to process. By default all\n"; - print " targets are processed.\n"; - print " - update: Update Wine's source code.\n"; - print " - build: Update the Wine builds.\n"; - print " - addons: Update the Gecko and Mono Wine addons.\n"; - print " - wineprefix: Update the wineprefixes.\n"; - print " - win32: Apply the above to the regular 32 bit Wine.\n"; - print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; - print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; - print " --no-rm Don't rebuild from scratch.\n"; - print " --help Shows this usage message.\n"; + print " --update Update Wine's source code.\n"; + print " --build Update the Wine builds.\n"; + print " --addons Update the Gecko and Mono Wine addons.\n"; + print " --wineprefix Update the wineprefixes.\n"; + print "If none of the above actions is specified they are all performed.\n"; + print " TARGETS Is a comma-separated list of targets to process. By default all\n"; + print " targets are processed.\n"; + print " - win32: Apply the above to the regular 32 bit Wine.\n"; + print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; + print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; + print " --no-rm Don't rebuild from scratch.\n"; + print " --help Shows this usage message.\n"; exit 0; } @@ -399,23 +438,11 @@ if ($DataDir =~ /'/) CountCPUs(); -if (!BuildTestAgentd() or - !GitPull($Targets) or - !UpdateAddOns($Targets) or - !BuildWine($Targets, $NoRm, "win32", "") or - !BuildWine($Targets, $NoRm, "wow64", "--enable-win64") or - !BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'") or - !NewWinePrefix($Targets, "win32") or - # The wow32 and wow64 wineprefixes: - # - Are essentially identical. - # - Must be created after both WoW builds have been updated. - # - Make it possible to run the wow32 and wow64 tests in separate prefixes, - # thus ensuring they don't interfere with each other. - !NewWinePrefix($Targets, "wow64") or - !NewWinePrefix($Targets, "wow32")) -{ - exit(1); -} +exit(1) if (!BuildTestAgentd()); +exit(1) if ($OptUpdate and !GitPull()); +exit(1) if ($OptAddOns and !UpdateAddOns()); +exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); +exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($Targets)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot/WineTest: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: ada7d8a85c8012e7c6e78549ec018985e8cf9b2f URL: https://source.winehq.org/git/tools.git/?a=commit;h=ada7d8a85c8012e7c6e7854… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:37 2018 +0200 testbot/WineTest: Clean up the command line options. This separates the actions (building or running WineTest) from the targets they apply to (the win32, wow32 and wow64 builds). This also renames the build action to --testpatch so it can later be seamlessly extended to perform a more thorough patch validation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1fa59c2..1010619 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -170,9 +170,9 @@ sub RunWine($$$) "time $Wine $Cmd $CmdArgs"); } -sub DailyWineTest($$$$) +sub DailyWineTest($$$$$) { - my ($Targets, $Build, $BaseTag, $Args) = @_; + my ($Targets, $Build, $NoSubmit, $BaseTag, $Args) = @_; return 1 if (!$Targets->{$Build}); @@ -190,7 +190,7 @@ sub DailyWineTest($$$$) } # Send the report to the website - if ($Targets->{submit} and + if (!$NoSubmit and RunWine($Build, "./programs/winetest/winetest.exe.so", "-c -s '../$Build.report'")) { @@ -210,13 +210,26 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64 submit); +map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); -my ($Usage, $TargetList, $Action, $FileName, $BaseTag); +my $Action = ""; +my ($Usage, $OptNoSubmit, $TargetList, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg =~ /^(?:-\?|-h|--help)$/) + if ($Arg eq "--testpatch" or $Arg eq "build") + { + $Action = "testpatch"; + } + elsif ($Arg eq "--winetest" or $Arg eq "winetest") + { + $Action = "winetest"; + } + elsif ($Arg eq "--no-submit") + { + $OptNoSubmit = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; last; @@ -231,11 +244,7 @@ while (@ARGV) { $TargetList = $Arg; } - elsif (!defined $Action) - { - $Action = $Arg; - } - elsif (($Action || "") eq "winetest") + elsif ($Action eq "winetest") { $BaseTag = $Arg; # The remaining arguments are meant for WineTest @@ -289,7 +298,7 @@ if (!defined $Usage) $Usage = 2; } - if (!defined $Action) + if (!$Action) { Error "you must specify the action to perform\n"; $Usage = 2; @@ -311,13 +320,8 @@ if (!defined $Usage) $Usage = 2; } } - elsif ($Action ne "build") - { - Error "invalid '$Action' action\n"; - $Usage = 2; - } - if (!defined $FileName and ($Action || "") eq "build") + if (!defined $FileName and $Action eq "testpatch") { Error "you must provide a patch to test\n"; $Usage = 2; @@ -325,25 +329,24 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--help] TARGETS build PATCH\n"; - print "or $Name0 [--help] TARGETS winetest BASETAG ARGS\n"; + print "Usage: $Name0 [--help] --testpatch TARGETS PATCH\n"; + print "or $Name0 [--help] --winetest [--no-submit] TARGETS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of targets for the specified action.\n"; - print " - win32: The regular 32 bit Wine build.\n"; - print " - wow32: The 32 bit WoW Wine build.\n"; - print " - wow64: The 64 bit WoW Wine build.\n"; - print " - submit: Send the WineTest result to the website.\n"; - print " build Verify that the patch compiles.\n"; - print " PATCH Is the staging file containing the patch to test.\n"; - print " winetest Run WineTest and submit the result to the website if the submit\n"; - print " task was specified.\n"; - print " BASETAG Is the tag for this WineTest run. Note that the build type is\n"; - print " automatically added to this tag.\n"; - print " ARGS The WineTest arguments.\n"; - print " --help Shows this usage message.\n"; + print " --testpatch Verify that the patch compiles.\n"; + print " --winetest Run WineTest and submit the result to the website.\n"; + print " --no-submit Do not submit the WineTest results to the website.\n"; + print " TARGETS Is a comma-separated list of targets for the specified action.\n"; + print " - win32: The regular 32 bit Wine build.\n"; + print " - wow32: The 32 bit WoW Wine build.\n"; + print " - wow64: The 64 bit WoW Wine build.\n"; + print " PATCH Is the staging file containing the patch to test.\n"; + print " BASETAG Is the tag for this WineTest run. Note that the build type is\n"; + print " automatically added to this tag.\n"; + print " ARGS The WineTest arguments.\n"; + print " --help Shows this usage message.\n"; exit $Usage; } @@ -363,7 +366,7 @@ map { unlink("$_.report") } keys %AllTargets; CountCPUs(); -if ($Action eq "build") +if ($Action eq "testpatch") { my $Impacts = ApplyPatch($FileName); exit(1) if (!$Impacts or @@ -373,9 +376,12 @@ if ($Action eq "build") } elsif ($Action eq "winetest") { - exit(1) if (!DailyWineTest($Targets, "win32", $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow64", $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow32", $BaseTag, \@ARGV)); + if (!DailyWineTest($Targets, "win32", $OptNoSubmit, $BaseTag, \@ARGV) or + !DailyWineTest($Targets, "wow64", $OptNoSubmit, $BaseTag, \@ARGV) or + !DailyWineTest($Targets, "wow32", $OptNoSubmit, $BaseTag, \@ARGV)) + { + exit(1); + } } LogMsg "ok\n";

1 0

Francois Gouget : testbot/Reconfig: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 4a3dade90d16546467b7fb006035e366e7ab192b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a3dade90d16546467b7fb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:13 2018 +0200 testbot/Reconfig: Clean up the command line options. This separates the actions (updating or building) from the targets they apply to (the exe32 and exe64 builds). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 69 +++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 450de0e..4aada32 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -125,11 +125,8 @@ sub BuildTestLauncher() return 1; } -sub GitPull($) +sub GitPull() { - my ($Targets) = @_; - return 1 if (!$Targets->{update}); - InfoMsg "\nUpdating the Wine source\n"; system("cd '$DataDir/wine' && git pull"); if ($? != 0) @@ -148,11 +145,10 @@ sub GitPull($) return 1; } -sub BuildNative($$) +sub BuildNative($) { - my ($Targets, $NoRm) = @_; + my ($NoRm) = @_; - return 1 if (!$Targets->{native}); mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate @@ -194,6 +190,15 @@ sub BuildCross($$$) return 1; } +sub UpdateWineBuilds($$) +{ + my ($Targets, $NoRm) = @_; + + return BuildNative($NoRm) && + BuildCross($Targets, $NoRm, 32) && + BuildCross($Targets, $NoRm, 64); +} + # # Setup and command line processing @@ -203,15 +208,23 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(update native exe32 exe64); +map { $AllTargets{$_} = 1 } qw(exe32 exe64); -my ($Usage, $TargetList, $NoRm); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $TargetList); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--no-rm") + if ($Arg eq "--update") { - $NoRm = 1; + $OptUpdate = 1; + } + elsif ($Arg eq "--build") + { + $OptBuild = 1; + } + elsif ($Arg eq "--no-rm") + { + $OptNoRm = 1; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -240,6 +253,10 @@ while (@ARGV) my $Targets; if (!defined $Usage) { + if (!$OptUpdate and !$OptBuild) + { + $OptUpdate = $OptBuild = 1; + } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); foreach my $Target (split /,/, $TargetList) { @@ -259,19 +276,19 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--no-rm] [--help] [TARGETS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--help] [TARGETS]\n"; print "\n"; print "Updates Wine to the latest version and recompiles it so the host is ready to build executables for the Windows tests.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of reconfiguration targets. By default\n"; - print " every target is run.\n"; - print " - update: Update Wine's source code.\n"; - print " - native: Rebuild the native Wine tools.\n"; - print " - exe32: Rebuild the 32 bit Windows test executables.\n"; - print " - exe64: Rebuild the 64 bit Windows test executables.\n"; - print " --no-rm Don't rebuild from scratch.\n"; - print " --help Shows this usage message.\n"; + print " --update Update Wine's source code.\n"; + print " --build Update the Wine builds.\n"; + print " TARGETS Is a comma-separated list of reconfiguration targets. By default\n"; + print " every target is run.\n"; + print " - exe32: Rebuild the 32 bit Windows test executables.\n"; + print " - exe64: Rebuild the 64 bit Windows test executables.\n"; + print " --no-rm Don't rebuild from scratch.\n"; + print " --help Shows this usage message.\n"; exit 0; } @@ -293,15 +310,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") CountCPUs(); -if (!BuildTestAgentd() or - !BuildTestLauncher() or - !GitPull($Targets) or - !BuildNative($Targets, $NoRm) or - !BuildCross($Targets, $NoRm, 32) or - !BuildCross($Targets, $NoRm, 64)) -{ - exit(1); -} +exit(1) if (!BuildTestAgentd() or !BuildTestLauncher()); +exit(1) if ($OptUpdate and !GitPull()); +exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot/CheckForWineTestUpdate: Switch to the build semantics.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: f7cb67ea490c312b58e7041a926250bbf066bc90 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7cb67ea490c312b58e7041… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:04 2018 +0200 testbot/CheckForWineTestUpdate: Switch to the build semantics. This matches the other scripts and simplifies the code in a couple of places. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index df5a326..21d2e15 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -59,8 +59,8 @@ use WineTestBot::Engine::Notify; my %WineTestUrls = ( - 32 => "http://test.winehq.org/builds/winetest-latest.exe", - 64 => "http://test.winehq.org/builds/winetest64-latest.exe" + "exe32" => "http://test.winehq.org/builds/winetest-latest.exe", + "exe64" => "http://test.winehq.org/builds/winetest64-latest.exe" ); my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1, @@ -96,9 +96,9 @@ error occurred. sub UpdateWineTest($$) { - my ($OptCreate, $Bits) = @_; + my ($OptCreate, $Build) = @_; - my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $BitsSuffix = ($Build eq "exe64" ? "64" : ""); my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; my $LatestFileName = "$DataDir/latest/$LatestBaseName"; if ($OptCreate) @@ -110,13 +110,13 @@ sub UpdateWineTest($$) # See if the online WineTest executable is newer my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); - my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Build}); if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); $Request->header("If-Modified-Since" => "$Since GMT"); } - Debug("Checking $WineTestUrls{$Bits}\n"); + Debug("Checking $WineTestUrls{$Build}\n"); my $Response = $UA->request($Request); if ($Response->code == RC_NOT_MODIFIED) { @@ -164,14 +164,14 @@ sub UpdateWineTest($$) sub AddJob($$$) { - my ($BaseJob, $LatestBaseName, $Bits) = @_; + my ($BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other"); $Remarks = "WineTest: $Remarks VMs"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); - if ($Bits == 64) + if ($Build eq "exe64") { $VMs->AddFilter("Type", ["win64"]); $VMs->AddFilter("Role", ["base", "winetest"]); @@ -197,22 +197,21 @@ sub AddJob($$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); + $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); - my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); $NewStep->FileName($LatestBaseName); - $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); + $NewStep->FileType($Build); # Add a task for each VM my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { - Debug(" $VMKey exe$Bits\n"); + Debug(" $VMKey $Build\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -406,7 +405,7 @@ my $Rc = 0; if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or $OptTypes{wine}) { - my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); if ($Create < 0) { $Rc = 1; @@ -417,8 +416,8 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or # this job first purely to make the WineTestBot job queue look nice, and # arbitrarily do it only for 32-bit executables to avoid redundant updates. $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); - $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); - $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); } @@ -431,14 +430,14 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or if ($OptTypes{all64}) { - my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe64"); if ($Create < 0) { $Rc = 1; } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, "exe64")); } }

1 0

Francois Gouget : testbot: Avoid map when when items must be handled in order.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: b278c2a057677b8d280cf823d74622b8880658ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=b278c2a057677b8d280cf82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:05:22 2018 +0200 testbot: Avoid map when when items must be handled in order. Instead use 'statement($_) for (@List)' which is just as readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- testbot/web/Munin.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index fc22a86..4ef7a66 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -113,7 +113,7 @@ sub SubmitSubset($$$) if (defined $Part and open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { - map { print $CombinedFile $_; } <$PartFile>; + print $CombinedFile $_ for (<$PartFile>); close($PartFile); } } diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 91155b7..840d912 100755 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -474,7 +474,7 @@ sub GetOutput($) # Then print the corresponding data print "===== data =====\n"; - map { print $_ } @Data; + print $_ for (@Data); }

1 0

Alexandre Julliard : Wine release 3.14
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: website Branch: master Commit: 62bb5eee888e8af6b8f61567b75b028a12e8151e URL: https://source.winehq.org/git/website.git/?a=commit;h=62bb5eee888e8af6b8f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 19:33:27 2018 +0200 Wine release 3.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018081701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018081701.xml b/news/en/2018081701.xml new file mode 100644 index 0000000..c3d3fb5 --- /dev/null +++ b/news/en/2018081701.xml @@ -0,0 +1,17 @@ +<news> +<date>August 17, 2018</date> +<title>Wine 3.14 Released</title> +<body> + The Wine development release 3.14 is now available. + <a href="{$root}/announce/3.14">What's new</a> in this release: +<ul> + <li>Support for DXTn texture decompression.</li> + <li>Deferral support for MSI install actions.</li> + <li>Support for Japanese keyboard in DirectInput.</li> + <li>More improvements in the standard Task Dialog.</li> + <li>A few more icons in Shell32.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.14.tar.xz">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

Tag wine-3.14 : Alexandre Julliard : Release 3.14
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: refs/tags/wine-3.14 Tag: fd166fd47dceddb0ec571c49a9dcc1e536f79487 URL: https://source.winehq.org/git/wine.git/?a=tag;h=fd166fd47dceddb0ec571c49a9d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 19:30:47 2018 +0200 Release 3.14

1 0

Alexandre Julliard : Release 3.14.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: c698682b3286d72cc7c4c4624b4d14b03dbe6908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c698682b3286d72cc7c4c462… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 19:30:47 2018 +0200 Release 3.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 785 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 462 insertions(+), 344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c698682b3286d72cc7c4…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 768de748be24e1754070e20a8d72cfd5764f88ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=768de748be24e1754070e20a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Aug 17 19:37:30 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 43f2b0e..7d4b8e9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 08:43+0300\n" +"PO-Revision-Date: 2018-08-17 19:36+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10683,14 +10683,14 @@ msgid "" "Specifying no file type after the equal sign removes the current\n" "association, if any.\n" msgstr "" -"ASSOC parodo ar modifikuoja failų prievardžių sąsajas.\n" +"ASSOC parodo ar modifikuoja failų prievardžių susiejimus.\n" "\n" "Sintaksė: ASSOC [.prv[=[failoTipas]]]\n" "\n" -"ASSOC be parametrų parodo dabartines failų sąsajas.\n" -"Jei naudojama tik su failo prievardžiu, parodo dabartinę sąsają.\n" -"Po lygybės ženklo nenurodžius failo tipo pašalina dabartinę sąsają, jei " -"yra.\n" +"ASSOC be parametrų parodo dabartinius failų susiejimus.\n" +"Jei naudojama tik su failo prievardžiu, parodo dabartinį susiejimą.\n" +"Po lygybės ženklo nenurodžius failo tipo pašalina dabartinį\n" +"susiejimą, jei yra.\n" #: cmd.rc:300 msgid "" @@ -10805,7 +10805,7 @@ msgid "" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" "CMD įtaisytos komandos yra:\n" -"ASSOC\t\tRodyti ar modifikuoti failų prievardžių sąsajas\n" +"ASSOC\t\tRodyti ar modifikuoti failų prievardžių susiejimus\n" "ATTRIB\t\tRodyti ar keisti DOS failo požymius\n" "CALL\t\tKviesti komandų failą iš kito komandų failo\n" "CD (CHDIR)\tPakeisti dabartinį numatytąjį katalogą\n" @@ -14217,11 +14217,11 @@ msgstr "S&palva:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME tipai" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Valdyti failų susie&jimus" #: winecfg.rc:308 msgid "Folders"

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
62
Older →

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 August 2018