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
This commit is contained in:
Tobias Hunger
2009-12-09 13:54:46 +01:00
parent a0abde6306
commit ec025c6dbf
54 changed files with 635 additions and 1035 deletions

View File

@@ -0,0 +1,95 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#include "gnumakeparser.h"
#include "taskwindow.h"
#include <QtCore/QDir>
#include <QtCore/QFile>
using namespace ProjectExplorer;
GnuMakeParser::GnuMakeParser(const QString &dir)
{
//make[4]: Entering directory `/some/dir'
m_makeDir.setPattern("^(?:mingw32-)?make.*: (\\w+) directory .(.+).$");
m_makeDir.setMinimal(true);
addDirectory(dir);
}
void GnuMakeParser::stdOutput(const QString &line)
{
QString lne = line.trimmed();
if (m_makeDir.indexIn(lne) > -1) {
if (m_makeDir.cap(1) == "Leaving")
removeDirectory(m_makeDir.cap(2));
else
addDirectory(m_makeDir.cap(2));
return;
}
IOutputParser::stdOutput(line);
}
void GnuMakeParser::addDirectory(const QString &dir)
{
if (dir.isEmpty() || m_directories.contains(dir))
return;
m_directories.append(dir);
}
void GnuMakeParser::removeDirectory(const QString &dir)
{
m_directories.removeAll(dir);
}
void GnuMakeParser::taskAdded(const ProjectExplorer::TaskWindow::Task &task)
{
ProjectExplorer::TaskWindow::Task editable(task);
QString filePath(QDir::cleanPath(task.file.trimmed()));
if (!filePath.isEmpty() && !QDir::isAbsolutePath(filePath)) {
QList<QFileInfo> possibleFiles;
foreach (const QString &dir, m_directories) {
QFileInfo candidate(dir + QLatin1Char('/') + filePath);
if (candidate.exists()
&& !possibleFiles.contains(candidate)) {
possibleFiles << candidate;
}
}
if (possibleFiles.size() == 1)
editable.file = possibleFiles.first().filePath();
// Let the Makestep apply additional heuristics (based on
// files in ther project) if we can not uniquely
// identify the file!
}
IOutputParser::taskAdded(editable);
}