Mention the build configuration when giving updates on operations.

E.g. say "starting to build for configuration gcc-debug". This is
especially useful when building for several configurations
simultaneously.

Change-Id: I441615d87be314ec819c2d2267a03fec770402eb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

5 files changed, 27 insertions, 10 deletions

diff --git a/src/lib/buildgraph/artifactcleaner.cpp b/src/lib/buildgraph/artifactcleaner.cpp
index be2d3525a..1fe5013b5 100644
--- a/src/lib/buildgraph/artifactcleaner.cpp
+++ b/src/lib/buildgraph/artifactcleaner.cpp
@@ -140,8 +140,14 @@ void ArtifactCleaner::cleanup(const QList<BuildProductPtr> &products, const Clea
 {
     m_hasError = false;
 
+    QString configString;
+    if (!products.isEmpty()) {
+        configString = Tr::tr(" for configuration %1")
+                .arg(products.first()->project->resolvedProject()->id());
+    }
+    m_observer->initialize(Tr::tr("Cleaning up%1").arg(configString), products.count() + 1);
+
     QSet<QString> directories;
-    m_observer->initialize(Tr::tr("Cleaning up"), products.count() + 1);
     foreach (const BuildProductConstPtr &product, products) {
         CleanupVisitor visitor(options, m_logger);
         visitor.visitProduct(product);
diff --git a/src/lib/buildgraph/buildproject.cpp b/src/lib/buildgraph/buildproject.cpp
index 297dc513c..0cc8a7f26 100644
--- a/src/lib/buildgraph/buildproject.cpp
+++ b/src/lib/buildgraph/buildproject.cpp
@@ -331,8 +331,8 @@ BuildProjectPtr BuildProjectResolver::resolveProject(const ResolvedProjectPtr &r
     m_project = BuildProjectPtr(new BuildProject(m_logger));
     m_project->setEvaluationContext(evalContext);
     m_project->setResolvedProject(resolvedProject);
-    evalContext->initializeObserver(Tr::tr("Setting up build graph"),
-                                    resolvedProject->products.count());
+    evalContext->initializeObserver(Tr::tr("Setting up build graph for configuration %1")
+                                    .arg(resolvedProject->id()), resolvedProject->products.count());
     foreach (ResolvedProductPtr rProduct, resolvedProject->products) {
         if (rProduct->enabled)
             resolveProduct(rProduct);
diff --git a/src/lib/buildgraph/executor.cpp b/src/lib/buildgraph/executor.cpp
index f473461c7..32ab2278b 100644
--- a/src/lib/buildgraph/executor.cpp
+++ b/src/lib/buildgraph/executor.cpp
@@ -580,6 +580,12 @@ void Executor::insertLeavesAfterAddingDependencies_recurse(Artifact *const artif
     }
 }
 
+QString Executor::configString() const
+{
+    return tr(" for configuration %1")
+            .arg(m_productsToBuild.first()->project->resolvedProject()->id());
+}
+
 void Executor::insertLeavesAfterAddingDependencies(QVector<Artifact *> dependencies)
 {
     QSet<Artifact *> seenArtifacts;
@@ -610,7 +616,7 @@ void Executor::setupProgressObserver(bool mocWillRun)
     }
     m_mocEffort = mocEffortCalculator.effort();
     const int totalEffort = m_mocEffort + buildEffortCalculator.effort();
-    m_progressObserver->initialize(tr("Building"), totalEffort);
+    m_progressObserver->initialize(tr("Building%1").arg(configString()), totalEffort);
 }
 
 void Executor::doSanityChecks()
@@ -722,15 +728,16 @@ void Executor::finish()
             }
         }
     }
+
     if (unbuiltProductNames.isEmpty()) {
-        m_logger.qbsInfo() << Tr::tr("Build done.");
+        m_logger.qbsInfo() << Tr::tr("Build done%1.").arg(configString());
     } else {
-        m_error.append(Tr::tr("The following products could not be built: %1.")
-                 .arg(unbuiltProductNames.join(", ")));
+        m_error.append(Tr::tr("The following products could not be built%1: %2.")
+                 .arg(configString(), unbuiltProductNames.join(", ")));
     }
 
     if (m_explicitlyCanceled)
-        m_error.append(Tr::tr("Build was canceled due to user request."));
+        m_error.append(Tr::tr("Build was canceled%1.").arg(configString()));
     setState(ExecutorIdle);
     if (m_progressObserver)
         m_progressObserver->setFinished();
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h
index fe9f984a7..f96a1d2d4 100644
--- a/src/lib/buildgraph/executor.h
+++ b/src/lib/buildgraph/executor.h
@@ -114,6 +114,8 @@ private:
     FileTime recursiveFileTime(const QString &filePath) const;
     void insertLeavesAfterAddingDependencies_recurse(Artifact *const artifact,
             QSet<Artifact *> *seenArtifacts, QList<Artifact *> *leaves) const;
+    QString configString() const;
+
     RulesEvaluationContextPtr m_evalContext;
     BuildOptions m_buildOptions;
     const Logger m_logger;
diff --git a/src/lib/language/loader.cpp b/src/lib/language/loader.cpp
index 0caab78e0..6eabe50aa 100644
--- a/src/lib/language/loader.cpp
+++ b/src/lib/language/loader.cpp
@@ -90,8 +90,10 @@ ResolvedProjectPtr Loader::loadProject(const SetupProjectParameters &parameters)
     // the project yet. That's why we use a placeholder here, so the user at least
     // sees that an operation is starting. The real total effort will be set later when
     // we have enough information.
-    if (m_progressObserver)
-        m_progressObserver->initialize(Tr::tr("Loading project"), 1);
+    if (m_progressObserver) {
+        m_progressObserver->initialize(Tr::tr("Loading project for configuration %1")
+                .arg(ResolvedProject::deriveId(parameters.buildConfiguration)), 1);
+    }
     ModuleLoaderResult loadResult
             = m_moduleLoader->load(parameters.projectFilePath,
                                    parameters.buildConfiguration,