Francois Gouget : testbot/PatchUtils: Detect when make_unicode needs to be run.
Alexandre Julliard
julliard at winehq.org
Mon Mar 16 16:45:12 CDT 2020
Module: tools
Branch: master
Commit: 0a640370e6a9f99a4738f463a8e1eda20547c75a
URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a640370e6a9f99a4738f463a8e1eda20547c75a
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Mar 13 11:12:19 2020 +0100
testbot/PatchUtils: Detect when make_unicode needs to be run.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/Build/Utils.pm | 10 ++++++++++
testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index cc61e31..c425078 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -157,6 +157,16 @@ sub ApplyPatch($$)
return undef;
}
}
+ if ($Impacts->{MakeUnicode})
+ {
+ InfoMsg "\nRunning make_unicode\n";
+ system("cd '$DataDir/$Dir/' && set -x && ./tools/make_unicode");
+ if ($? != 0)
+ {
+ LogMsg "make_unicode failed\n";
+ return undef;
+ }
+ }
if ($Impacts->{MakeVulkan})
{
InfoMsg "\nRunning make_vulkan\n";
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index f55dc4b..eaa9868 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -341,6 +341,11 @@ sub GetPatchImpacts($)
$Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;
$Impacts->{IsWinePatch} = 1;
}
+ elsif ($Line =~ m=^--- \w+/tools/make_unicode$=)
+ {
+ $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1;
+ $Impacts->{IsWinePatch} = 1;
+ }
elsif ($Line =~ m=^--- /dev/null$=)
{
$Change = "new";
More information about the wine-cvs
mailing list