From b1e4e96aaa03f79d26b3c2a9c0a3c652eb81d23a Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Sun, 6 Sep 2015 22:52:15 -0400
Subject: [PATCH] Move StatusView to BuildContext.

---
 modules/ksb/Application.pm  | 1 +
 modules/ksb/BuildContext.pm | 9 +++++++++
 modules/ksb/BuildSystem.pm  | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/ksb/Application.pm b/modules/ksb/Application.pm
index 89f0105..dc4f05b 100644
--- a/modules/ksb/Application.pm
+++ b/modules/ksb/Application.pm
@@ -1454,6 +1454,7 @@ EOF
     };
 
     my $num_modules = scalar @modules;
+    my $statusViewer = $ctx->statusViewer();
     my $i = 1;
 
     while (my $module = shift @modules)
diff --git a/modules/ksb/BuildContext.pm b/modules/ksb/BuildContext.pm
index e9414ba..c81ea85 100644
--- a/modules/ksb/BuildContext.pm
+++ b/modules/ksb/BuildContext.pm
@@ -27,6 +27,8 @@ use ksb::Module;
 use ksb::Module::BranchGroupResolver;
 use ksb::Updater::KDEProjectMetadata;
 use ksb::Version qw(scriptVersion);
+use ksb::StatusView;
+
 use File::Temp qw(tempfile);
 use File::Spec; # rel2abs
 
@@ -152,6 +154,7 @@ sub new
         kde_projects_filehandle => undef, # Filehandle to read database from.
         kde_projects_metadata   => undef, # See ksb::Module::KDEProjects
         logical_module_resolver => undef, # For branch-group option.
+        status_view => ksb::StatusView->new(),
     );
 
     # Merge all new options into our self-hash.
@@ -989,4 +992,10 @@ sub moduleBranchGroupResolver
     return $self->{logical_module_resolver};
 }
 
+sub statusViewer
+{
+    my $self = shift;
+    return $self->{status_view};
+}
+
 1;
diff --git a/modules/ksb/BuildSystem.pm b/modules/ksb/BuildSystem.pm
index 45ac73d..fefc35d 100644
--- a/modules/ksb/BuildSystem.pm
+++ b/modules/ksb/BuildSystem.pm
@@ -426,6 +426,7 @@ sub _runBuildCommand
 {
     my ($self, $message, $filename, $argRef) = @_;
     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)
@@ -436,7 +437,7 @@ sub _runBuildCommand
         return log_command($module, $filename, $argRef);
     }
 
-    my $statusViewer = ksb::StatusView->new();
+    my $statusViewer = $ctx->statusViewer();
     $statusViewer->setStatus("\t$message");
     $statusViewer->update();