forked from qt-creator/qt-creator
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:
82
src/plugins/projectexplorer/ioutputparser.cpp
Normal file
82
src/plugins/projectexplorer/ioutputparser.cpp
Normal file
@@ -0,0 +1,82 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** 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 "ioutputparser.h"
|
||||
#include "utils/qtcassert.h"
|
||||
|
||||
namespace ProjectExplorer {
|
||||
|
||||
IOutputParser::IOutputParser() : m_parser(0)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
IOutputParser::~IOutputParser()
|
||||
{
|
||||
delete m_parser;
|
||||
}
|
||||
|
||||
void IOutputParser::appendOutputParser(IOutputParser *parser)
|
||||
{
|
||||
QTC_ASSERT(parser, return);
|
||||
if (m_parser) {
|
||||
m_parser->appendOutputParser(parser);
|
||||
return;
|
||||
}
|
||||
|
||||
m_parser = parser;
|
||||
connect(parser, SIGNAL(addOutput(QString)),
|
||||
this, SLOT(outputAdded(QString)));
|
||||
connect(parser, SIGNAL(addTask(ProjectExplorer::TaskWindow::Task)),
|
||||
this, SLOT(taskAdded(ProjectExplorer::TaskWindow::Task)));
|
||||
}
|
||||
|
||||
void IOutputParser::stdOutput(const QString &line)
|
||||
{
|
||||
if (m_parser)
|
||||
m_parser->stdOutput(line);
|
||||
}
|
||||
|
||||
void IOutputParser::stdError(const QString &line)
|
||||
{
|
||||
if (m_parser)
|
||||
m_parser->stdError(line);
|
||||
}
|
||||
|
||||
void IOutputParser::outputAdded(const QString &string)
|
||||
{
|
||||
emit addOutput(string);
|
||||
}
|
||||
|
||||
void IOutputParser::taskAdded(const ProjectExplorer::TaskWindow::Task &task)
|
||||
{
|
||||
emit addTask(task);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user