Rework Build Parser handling

 * Rework IBuildParser:
    * Remove name() method.
    * Remove enterDirectory and leaveDirectory signals.
    * Allow chaining of parsers.
 * Rename IBuildParser to IOutputParser.
 * Implement GnuMakeParser.
    * Remove entering/leaving directory related code from all other parsers
    * Move filename fixup heuristic based on entering/leaving directory
      massages from gnumake here from AbstractMakeStep.
 * Add outputParser method to ToolChain: This removes the need to map
   toolchains to BuildParser names in the BuildSteps.
 * Enhance AbstractProcessStep to accept a IOutputParser to parse its output.
 * Remove AbstractMakeStep.
 * Set the appropriate Parsers in all classes deriving from AbstractProcessStep
   and append the ToolChain's parser to the parser chain.
 * Remove BuildParserFactories: There is no more need for them.
 * Remove constants used to identify the BuildParsers.
 * Clean up some names:
    * Replace stdOut with stdOutput.
    * Replace addToTaskWindow with addTask and addToOutputWindow with
      addOutput. Do this wherever it is not yet clear that this will end up
      in the Task/Output window.

Reviewed-by: dt

1 files changed, 16 insertions, 12 deletions

diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 332f2fcc625..86a74073e51 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -32,6 +32,7 @@
 #include "cmakebuildconfiguration.h"
 
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/gnumakeparser.h>
 
 #include <QtGui/QFormLayout>
 #include <QtGui/QGroupBox>
@@ -43,14 +44,14 @@ using namespace CMakeProjectManager;
 using namespace CMakeProjectManager::Internal;
 using namespace ProjectExplorer;
 
-MakeStep::MakeStep(BuildConfiguration *bc)
-    : AbstractMakeStep(bc), m_clean(false), m_futureInterface(0)
+MakeStep::MakeStep(BuildConfiguration *bc) :
+    AbstractProcessStep(bc), m_clean(false), m_futureInterface(0)
 {
     m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]");
 }
 
-MakeStep::MakeStep(MakeStep *bs, BuildConfiguration *bc)
-    : AbstractMakeStep(bs, bc),
+MakeStep::MakeStep(MakeStep *bs, BuildConfiguration *bc) :
+    AbstractProcessStep(bs, bc),
     m_clean(bs->m_clean),
     m_futureInterface(0),
     m_buildTargets(bs->m_buildTargets),
@@ -78,7 +79,7 @@ void MakeStep::restoreFromGlobalMap(const QMap<QString, QVariant> &map)
 {
     if (map.value("clean").isValid() && map.value("clean").toBool())
         m_clean = true;
-    AbstractMakeStep::restoreFromGlobalMap(map);
+    AbstractProcessStep::restoreFromGlobalMap(map);
 }
 
 void MakeStep::restoreFromLocalMap(const QMap<QString, QVariant> &map)
@@ -87,7 +88,7 @@ void MakeStep::restoreFromLocalMap(const QMap<QString, QVariant> &map)
     m_additionalArguments = map["additionalArguments"].toStringList();
     if (map.value("clean").isValid() && map.value("clean").toBool())
         m_clean = true;
-    AbstractMakeStep::restoreFromLocalMap(map);
+    AbstractProcessStep::restoreFromLocalMap(map);
 }
 
 void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
@@ -96,13 +97,12 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
     map["additionalArguments"] = m_additionalArguments;
     if (m_clean)
         map["clean"] = true;
-    AbstractMakeStep::storeIntoLocalMap(map);
+    AbstractProcessStep::storeIntoLocalMap(map);
 }
 
 bool MakeStep::init()
 {
     CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
-    setBuildParser(bc->buildParser());
 
     setEnabled(true);
     setWorkingDirectory(bc->buildDirectory());
@@ -115,14 +115,18 @@ bool MakeStep::init()
     setEnvironment(bc->environment());
     setIgnoreReturnValue(m_clean);
 
-    return AbstractMakeStep::init();
+    setOutputParser(new ProjectExplorer::GnuMakeParser(workingDirectory()));
+    if (bc->toolChain())
+        appendOutputParser(bc->toolChain()->outputParser());
+
+    return AbstractProcessStep::init();
 }
 
 void MakeStep::run(QFutureInterface<bool> &fi)
 {
     m_futureInterface = &fi;
     m_futureInterface->setProgressRange(0, 100);
-    AbstractMakeStep::run(fi);
+    AbstractProcessStep::run(fi);
     m_futureInterface->setProgressValue(100);
     m_futureInterface->reportFinished();
     m_futureInterface = 0;
@@ -135,7 +139,7 @@ QString MakeStep::name()
 
 QString MakeStep::displayName()
 {
-    return "Make";
+    return QLatin1String("Make");
 }
 
 BuildStepConfigWidget *MakeStep::createConfigWidget()
@@ -156,7 +160,7 @@ void MakeStep::stdOut(const QString &line)
         if (ok)
             m_futureInterface->setProgressValue(percent);
     }
-    AbstractMakeStep::stdOut(line);
+    AbstractProcessStep::stdOutput(line);
 }
 
 bool MakeStep::buildsTarget(const QString &target) const