From 221cc387887eb77e2367a6927330fd4b28c94a19 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 3 Aug 2010 17:24:20 +0200
Subject: [PATCH] Add output parser for Qt-specific utilities
* Handle moc warnings there
* Add unit tests
* Use new parser in Qt's makestep
Task-number: QTCREATORBUG-1908
---
src/plugins/qt4projectmanager/makestep.cpp | 4 +-
.../qt4projectmanager/qt4projectmanager.pro | 2 +
.../qt4projectmanagerplugin.h | 2 +
src/plugins/qt4projectmanager/qtparser.cpp | 130 ++++++++++++++++++
src/plugins/qt4projectmanager/qtparser.h | 55 ++++++++
5 files changed, 192 insertions(+), 1 deletion(-)
create mode 100644 src/plugins/qt4projectmanager/qtparser.cpp
create mode 100644 src/plugins/qt4projectmanager/qtparser.h
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 26c6128ea59..6ca7e210787 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -34,6 +34,7 @@
#include "qt4target.h"
#include "qt4buildconfiguration.h"
#include "qt4projectmanagerconstants.h"
+#include "qtparser.h"
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h>
@@ -170,7 +171,8 @@ bool MakeStep::init()
setEnabled(true);
setArguments(args);
- setOutputParser(new ProjectExplorer::GnuMakeParser(workingDirectory));
+ setOutputParser(new QtParser);
+ appendOutputParser(new ProjectExplorer::GnuMakeParser(workingDirectory));
if (toolchain)
appendOutputParser(toolchain->outputParser());
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 2e2ee5083cc..82de87a1070 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -4,6 +4,7 @@ QT += network
include(../../qtcreatorplugin.pri)
include(qt4projectmanager_dependencies.pri)
HEADERS += qt4deployconfiguration.h \
+ qtparser.h \
qt4projectmanagerplugin.h \
qt4projectmanager.h \
qt4project.h \
@@ -48,6 +49,7 @@ HEADERS += qt4deployconfiguration.h \
qmakeparser.h \
qtoutputformatter.h
SOURCES += qt4deployconfiguration.cpp \
+ qtparser.cpp \
qt4projectmanagerplugin.cpp \
qt4projectmanager.cpp \
qt4project.cpp \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index ca95e37c939..0a771d4db2a 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -80,6 +80,8 @@ private slots:
void testAbldOutputParsers_data();
void testAbldOutputParsers();
+ void testQtOutputParser_data();
+ void testQtOutputParser();
#endif
private:
diff --git a/src/plugins/qt4projectmanager/qtparser.cpp b/src/plugins/qt4projectmanager/qtparser.cpp
new file mode 100644
index 00000000000..7c9aa3d28de
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtparser.cpp
@@ -0,0 +1,130 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 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 "qtparser.h"
+#include "qt4projectmanagerconstants.h"
+
+#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <utils/qtcassert.h>
+
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+using ProjectExplorer::Task;
+
+namespace {
+ // opt. drive letter + filename: (2 brackets)
+ const char * const FILE_PATTERN = "^(([A-Za-z]:)?[^:]+\\.[^:]+):";
+}
+
+QtParser::QtParser()
+{
+ m_mocRegExp.setPattern(QString::fromLatin1(FILE_PATTERN) + "(\\d+):\\s(Warning|Error):\\s(.+)$");
+ m_mocRegExp.setMinimal(true);
+}
+
+void QtParser::stdError(const QString &line)
+{
+ QString lne(line.trimmed());
+ if (m_mocRegExp.indexIn(lne) > -1) {
+ bool ok;
+ int lineno = m_mocRegExp.cap(3).toInt(&ok);
+ if (!ok)
+ lineno = -1;
+ Task task(Task::Error,
+ m_mocRegExp.cap(5).trimmed(),
+ m_mocRegExp.cap(1) /* filename */,
+ lineno,
+ ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
+ if (m_mocRegExp.cap(4) == QLatin1String("Warning"))
+ task.type = Task::Warning;
+ emit addTask(task);
+ return;
+ }
+ IOutputParser::stdError(line);
+}
+
+// Unit tests:
+
+#ifdef WITH_TESTS
+# include <QTest>
+
+# include "qt4projectmanagerplugin.h"
+# include <projectexplorer/projectexplorerconstants.h>
+# include <projectexplorer/metatypedeclarations.h>
+# include <projectexplorer/outputparser_test.h>
+
+using namespace ProjectExplorer;
+
+void Qt4ProjectManagerPlugin::testQtOutputParser_data()
+{
+ QTest::addColumn<QString>("input");
+ QTest::addColumn<OutputParserTester::Channel>("inputChannel");
+ QTest::addColumn<QString>("childStdOutLines");
+ QTest::addColumn<QString>("childStdErrLines");
+ QTest::addColumn<QList<ProjectExplorer::Task> >("tasks");
+ QTest::addColumn<QString>("outputLines");
+
+
+ QTest::newRow("pass-through stdout")
+ << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
+ << QString::fromLatin1("Sometext") << QString()
+ << QList<ProjectExplorer::Task>()
+ << QString();
+ QTest::newRow("pass-through stderr")
+ << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
+ << QString() << QString::fromLatin1("Sometext")
+ << QList<ProjectExplorer::Task>()
+ << QString();
+
+ QTest::newRow("moc warning")
+ << QString::fromLatin1("..\\untitled\\errorfile.h:0: Warning: No relevant classes found. No output generated.")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
+ QLatin1String("No relevant classes found. No output generated."),
+ QLatin1String("..\\untitled\\errorfile.h"), 0,
+ ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
+ << QString();
+}
+
+void Qt4ProjectManagerPlugin::testQtOutputParser()
+{
+ OutputParserTester testbench;
+ testbench.appendOutputParser(new QtParser);
+ QFETCH(QString, input);
+ QFETCH(OutputParserTester::Channel, inputChannel);
+ QFETCH(QList<Task>, tasks);
+ QFETCH(QString, childStdOutLines);
+ QFETCH(QString, childStdErrLines);
+ QFETCH(QString, outputLines);
+
+ testbench.testParsing(input, inputChannel, tasks, childStdOutLines, childStdErrLines, outputLines);
+}
+#endif
diff --git a/src/plugins/qt4projectmanager/qtparser.h b/src/plugins/qt4projectmanager/qtparser.h
new file mode 100644
index 00000000000..d59bd764c9d
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtparser.h
@@ -0,0 +1,55 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 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.
+**
+**************************************************************************/
+
+#ifndef QTPARSER_H
+#define QTPARSER_H
+
+#include <projectexplorer/ioutputparser.h>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+// Parser for Qt-specific utilities like moc, uic, etc.
+
+class QtParser : public ProjectExplorer::IOutputParser
+{
+ Q_OBJECT
+
+public:
+ QtParser();
+ virtual void stdError(const QString &line);
+
+private:
+ QRegExp m_mocRegExp;
+};
+
+} // namesapce Internal
+} // namespace ProjectExplorer
+
+#endif // QTPARSER_H
--
GitLab