Provide a logger instance to the generators

Replace a qDebug usage with it.

Change-Id: I4fa34c2e48100a6ec7c10bae8d2ca186dbab9d29
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 20 insertions, 7 deletions

diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 5003cdfec..bd35e3bcb 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -504,7 +504,8 @@ void CommandLineFrontend::generate()
     generator->generate(m_projects,
                         m_parser.buildConfigurations(),
                         m_parser.installOptions(QString()),
-                        m_parser.settingsDir());
+                        m_parser.settingsDir(),
+                        ConsoleLogger::instance(m_settings));
 }
 
 int CommandLineFrontend::runTarget()
diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index b58ae1ea2..87cd701d9 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "generator.h"
+#include <logging/logger.h>
 #include <tools/error.h>
 #include <tools/hostosinfo.h>
 #include <tools/installoptions.h>
@@ -52,6 +53,7 @@ public:
     QList<QVariantMap> buildConfigurations;
     InstallOptions installOptions;
     QString qbsSettingsDir;
+    Internal::Logger logger = Internal::Logger(nullptr);
 };
 
 ProjectGenerator::ProjectGenerator()
@@ -79,7 +81,8 @@ static QString _configurationName(const QVariantMap &buildConfiguration)
 void ProjectGenerator::generate(const QList<Project> &projects,
                                 const QList<QVariantMap> &buildConfigurations,
                                 const InstallOptions &installOptions,
-                                const QString &qbsSettingsDir)
+                                const QString &qbsSettingsDir,
+                                const Internal::Logger &logger)
 {
     d->projects = projects;
     std::sort(d->projects.begin(), d->projects.end(),
@@ -91,6 +94,7 @@ void ProjectGenerator::generate(const QList<Project> &projects,
                   return _configurationName(a) < _configurationName(b); });
     d->installOptions = installOptions;
     d->qbsSettingsDir = qbsSettingsDir;
+    d->logger = logger;
     generate();
 }
 
@@ -233,4 +237,9 @@ QString ProjectGenerator::qbsSettingsDir() const
     return d->qbsSettingsDir;
 }
 
+const Internal::Logger &ProjectGenerator::logger() const
+{
+    return d->logger;
+}
+
 } // namespace qbs
diff --git a/src/lib/corelib/generators/generator.h b/src/lib/corelib/generators/generator.h
index 3ba436c0f..8c7bfde8b 100644
--- a/src/lib/corelib/generators/generator.h
+++ b/src/lib/corelib/generators/generator.h
@@ -71,7 +71,8 @@ public:
     void generate(const QList<Project> &projects,
                   const QList<QVariantMap> &buildConfigurations,
                   const InstallOptions &installOptions,
-                  const QString &qbsSettingsDir);
+                  const QString &qbsSettingsDir,
+                  const Internal::Logger &logger);
 
     const GeneratableProject project() const;
     QFileInfo qbsExecutableFilePath() const;
@@ -87,6 +88,8 @@ private:
 protected:
     ProjectGenerator();
 
+    const Internal::Logger &logger() const;
+
 private:
     ProjectGeneratorPrivate *d;
 };
diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
index 4b3667140..5b69ade31 100644
--- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
+++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
@@ -56,7 +56,6 @@
 #include <tools/visualstudioversioninfo.h>
 
 #include <QtCore/qcoreapplication.h>
-#include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
@@ -262,7 +261,8 @@ static void writeProjectFiles(const QMap<QString, std::shared_ptr<MSBuildProject
 }
 
 static void writeSolution(const std::shared_ptr<VisualStudioSolution> &solution,
-                          const QString &solutionFilePath)
+                          const QString &solutionFilePath,
+                          const Internal::Logger &logger)
 {
     Internal::FileSaver file(solutionFilePath);
     if (!file.open())
@@ -273,7 +273,7 @@ static void writeSolution(const std::shared_ptr<VisualStudioSolution> &solution,
     if (!(writer.write(solution.get()) && file.commit()))
         throw ErrorInfo(Tr::tr("Failed to generate %1").arg(solutionFilePath));
 
-    qDebug() << "Generated" << qPrintable(QFileInfo(solutionFilePath).fileName());
+    logger.qbsInfo() << Tr::tr("Generated %1").arg(QFileInfo(solutionFilePath).fileName());
 }
 
 void VisualStudioGenerator::generate()
@@ -288,7 +288,7 @@ void VisualStudioGenerator::generate()
     it.accept(&solutionDependenciesVisitor);
 
     writeProjectFiles(d->msbuildProjects);
-    writeSolution(d->solution, d->solutionFilePath);
+    writeSolution(d->solution, d->solutionFilePath, logger());
 
     d->reset();
 }