Francois Gouget : testbot/build: Tweak the Build.pl information messages for readability.
Alexandre Julliard
julliard at winehq.org
Fri Jun 1 13:03:00 CDT 2018
Module: tools
Branch: master
Commit: c2d95510ee2042e0e7519151f31a77fac1059c03
URL: https://source.winehq.org/git/tools.git/?a=commit;h=c2d95510ee2042e0e7519151f31a77fac1059c03
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Jun 1 09:14:46 2018 +0200
testbot/build: Tweak the Build.pl information messages for readability.
Add an empty line before the information messages to make the log more
readable.
Also tweak the native tools build message.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/build/Build.pl | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 03733ce..77bc9ca 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -89,7 +89,7 @@ sub ApplyPatch($)
my $Impacts = GetPatchImpact($PatchFile, "nounits");
if ($Impacts->{Makefiles})
{
- InfoMsg "Running make_makefiles\n";
+ InfoMsg "\nRunning make_makefiles\n";
system("( cd $DataDir/wine && set -x && " .
" ./tools/make_makefiles " .
") >> $LogDir/Build.log 2>&1");
@@ -102,7 +102,7 @@ sub ApplyPatch($)
if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure})
{
- InfoMsg "Running autoconf\n";
+ InfoMsg "\nRunning autoconf\n";
system("( cd $DataDir/wine && set -x && " .
" autoconf " .
") >>$LogDir/Build.log 2>&1");
@@ -131,6 +131,8 @@ sub CountCPUs()
sub BuildNative()
{
mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");
+
+ InfoMsg "\nRebuilding native tools\n";
system("( cd $DataDir/build-native && set -x && " .
" time make -j$ncpus __tooldeps__ " .
") >>$LogDir/Build.log 2>&1");
@@ -157,7 +159,7 @@ sub BuildTestExecutable($$$)
$TestExecutable .= "_test.exe";
unlink("$DataDir/build-mingw${Bits}/$TestExecutable");
- InfoMsg "Building the $Bits-bit test executable\n";
+ InfoMsg "\nBuilding the $Bits-bit test executable\n";
system("( cd $DataDir/build-mingw$Bits && set -x && " .
" time make -j$ncpus $TestsDir " .
") >>$LogDir/Build.log 2>&1");
@@ -256,7 +258,6 @@ if (!ApplyPatch($PatchFile))
CountCPUs();
-InfoMsg "Building tools\n";
if (!BuildNative())
{
exit(1);
More information about the wine-cvs
mailing list