Compile: add ability to parse standard output in build

When working with make wrapper scripts, sometimes they forward
everything to stdout. When this happens failures are not parsed,
and the are not "clickable" in QtC.
This patch adds an option to enable parsing of standard output.

Change-Id: I44b283dbdf6286f90c546898d496bff41de0d5ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

5 files changed, 28 insertions, 2 deletions

diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index f0012314c2..4efcae7646 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -217,6 +217,7 @@ public:
     bool boldFontEnabled = true;
     bool prependCarriageReturn = false;
     bool prependLineFeed = false;
+    bool forwardStdOutToStdError = false;
 };
 
 OutputFormatter::OutputFormatter() : d(new Private) { }
@@ -574,6 +575,11 @@ void OutputFormatter::setBoldFontEnabled(bool enabled)
     d->formats[ErrorMessageFormat].setFontWeight(fontWeight);
 }
 
+void OutputFormatter::setForwardStdOutToStdError(bool enabled)
+{
+    d->forwardStdOutToStdError = enabled;
+}
+
 void OutputFormatter::flush()
 {
     if (!d->incompleteLine.first.isEmpty())
@@ -608,7 +614,7 @@ void OutputFormatter::dropSearchDir(const FilePath &dir)
 OutputFormat OutputFormatter::outputTypeForParser(const OutputLineParser *parser,
                                                   OutputFormat type) const
 {
-    if (type == StdOutFormat && parser->needsRedirection())
+    if (type == StdOutFormat && (parser->needsRedirection() || d->forwardStdOutToStdError))
         return StdErrFormat;
     return type;
 }
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 76fbc273fa..f3a19ca2fb 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -155,6 +155,7 @@ public:
     bool handleFileLink(const QString &href);
     void handleLink(const QString &href);
     void setBoldFontEnabled(bool enabled);
+    void setForwardStdOutToStdError(bool enabled);
 
     bool hasFatalErrors() const;
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 034ff4fcbf..b743071455 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -69,6 +69,7 @@ const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildS
 const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "ProjectExplorer.BuildConfiguration.ClearSystemEnvironment";
 const char USER_ENVIRONMENT_CHANGES_KEY[] = "ProjectExplorer.BuildConfiguration.UserEnvironmentChanges";
 const char CUSTOM_PARSERS_KEY[] = "ProjectExplorer.BuildConfiguration.CustomParsers";
+const char PARSE_STD_OUT_KEY[] = "ProjectExplorer.BuildConfiguration.ParseStandardOutput";
 
 namespace ProjectExplorer {
 namespace Internal {
@@ -117,9 +118,17 @@ class CustomParsersBuildWidget : public NamedWidget
 public:
     CustomParsersBuildWidget(BuildConfiguration *bc) : NamedWidget(tr("Custom Output Parsers"))
     {
-        const auto selectionWidget = new CustomParsersSelectionWidget(this);
         const auto layout = new QVBoxLayout(this);
         layout->setContentsMargins(0, 0, 0, 0);
+
+        const auto pasteStdOutCB = new QCheckBox(tr("Parse standard output during build"), this);
+        pasteStdOutCB->setToolTip(tr("Check this to make output parsers look for diagnostics "
+                                     "on stdout rather than stderr"));
+        pasteStdOutCB->setChecked(bc->parseStdOut());
+        layout->addWidget(pasteStdOutCB);
+
+        connect(pasteStdOutCB, &QCheckBox::clicked, bc, &BuildConfiguration::setParseStdOut);
+        const auto selectionWidget = new CustomParsersSelectionWidget(this);
         layout->addWidget(selectionWidget);
 
         connect(selectionWidget, &CustomParsersSelectionWidget::selectionChanged,
@@ -152,6 +161,7 @@ public:
     QList<Utils::Id> m_initialBuildSteps;
     QList<Utils::Id> m_initialCleanSteps;
     Utils::MacroExpander m_macroExpander;
+    bool m_parseStdOut = false;
     QList<Utils::Id> m_customParsers;
 
     // FIXME: Remove.
@@ -387,6 +397,7 @@ QVariantMap BuildConfiguration::toMap() const
     map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(0), d->m_buildSteps.toMap());
     map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QString::number(1), d->m_cleanSteps.toMap());
 
+    map.insert(PARSE_STD_OUT_KEY, d->m_parseStdOut);
     map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Utils::Id::toSetting));
 
     return map;
@@ -421,6 +432,7 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
         }
     }
 
+    d->m_parseStdOut = map.value(PARSE_STD_OUT_KEY).toBool();
     d->m_customParsers = transform(map.value(CUSTOM_PARSERS_KEY).toList(), &Utils::Id::fromSetting);
 
     const bool res = ProjectConfiguration::fromMap(map);
@@ -518,6 +530,9 @@ void BuildConfiguration::setCustomParsers(const QList<Utils::Id> &parsers)
     d->m_customParsers = parsers;
 }
 
+bool BuildConfiguration::parseStdOut() const { return d->m_parseStdOut; }
+void BuildConfiguration::setParseStdOut(bool b) { d->m_parseStdOut = b; }
+
 bool BuildConfiguration::useSystemEnvironment() const
 {
     return !d->m_clearSystemEnvironment;
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index d40aa33604..7bf743367f 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -79,6 +79,8 @@ public:
 
     virtual void addToEnvironment(Utils::Environment &env) const;
 
+    bool parseStdOut() const;
+    void setParseStdOut(bool b);
     const QList<Utils::Id> customParsers() const;
     void setCustomParsers(const QList<Utils::Id> &parsers);
 
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 41f0b49209..94bdf78acc 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -282,6 +282,8 @@ void BuildStep::setupOutputFormatter(OutputFormatter *formatter)
             if (Internal::CustomParser * const parser = Internal::CustomParser::createFromId(id))
                 formatter->addLineParser(parser);
         }
+
+        formatter->setForwardStdOutToStdError(buildConfiguration()->parseStdOut());
     }
     Utils::FileInProjectFinder fileFinder;
     fileFinder.setProjectDirectory(project()->projectDirectory());