From 742d92ac938f9e30f8ccbdbcdea8a268be30aca0 Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Mon, 5 Mar 2018 23:28:21 -0500
Subject: [PATCH] Don't shortcut build output for non-CMake build systems.

There is code to avoid using the TTY code that updates the status of the
build in the current line.  This code prevents using the fancy TTY stuff
if progress output is not supported, but doesn't actually ever output
the end result of the build (success or failure), which wasn't the
intent.

In the other situations we don't want to clutter the line output with a
redundant status.  Instead of duplicating the "progress output
supported" check later to output the status (or not), I just took out
the check for whether progress output is supported entirely, since the
progress callback can work even with build systems w/out support.

BUG:391396
FIXED-IN:18.04
---
 modules/ksb/BuildSystem.pm      | 16 ++++------------
 modules/ksb/BuildSystem/KDE4.pm |  5 -----
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/modules/ksb/BuildSystem.pm b/modules/ksb/BuildSystem.pm
index 4a7765a..b52c87b 100644
--- a/modules/ksb/BuildSystem.pm
+++ b/modules/ksb/BuildSystem.pm
@@ -92,13 +92,6 @@ sub isSubdirBuildable
     return 1;
 }
 
-# Returns true if the buildsystem will give percentage-completion updates on its output.
-# Such percentage updates will be searched for to update the kdesrc-build status.
-sub isProgressOutputSupported
-{
-    return 0;
-}
-
 # Called by the module being built before it runs its build/install process. Should
 # setup any needed environment variables, build context settings, etc., in preparation
 # for the build and install phases.
@@ -437,11 +430,10 @@ sub _runBuildCommand
     my $module = $self->module();
     my $ctx = $module->buildContext();
 
-    # There are situations when we don't want (or can't get) progress output:
-    # 1. Not using CMake (i.e. Qt)
-    # 2. If we're not printing to a terminal.
-    # 3. When we're debugging (we'd interfere with debugging output).
-    if (!$self->isProgressOutputSupported() || ! -t STDERR || debugging())
+    # There are situations when we don't want progress output:
+    # 1. If we're not printing to a terminal.
+    # 2. When we're debugging (we'd interfere with debugging output).
+    if (! -t STDERR || debugging())
     {
         note("\t$message");
         return log_command($module, $filename, $argRef);
diff --git a/modules/ksb/BuildSystem/KDE4.pm b/modules/ksb/BuildSystem/KDE4.pm
index 7c8bdfd..ac33dcd 100644
--- a/modules/ksb/BuildSystem/KDE4.pm
+++ b/modules/ksb/BuildSystem/KDE4.pm
@@ -25,11 +25,6 @@ sub name
     return 'KDE';
 }
 
-sub isProgressOutputSupported
-{
-    return 1;
-}
-
 # Called by the module being built before it runs its build/install process. Should
 # setup any needed environment variables, build context settings, etc., in preparation
 # for the build and install phases.