Commit a544ab67 authored by Fawzi Mohamed's avatar Fawzi Mohamed

projectexplorer/qmake-makestep: parse output of xcodebuild

Xcodebuild (used by default for ios and optionally on mac) redirects all
compile errors to stdout.
This breaks the detection of errors.
Redirect stdout to stderr if within xcodebuild.

Change-Id: I60fd21a7b075fbfc29c99a10debf34e20487c4df
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 16d3881b
......@@ -256,6 +256,9 @@ private slots:
void testGnuMakeParserTaskMangling_data();
void testGnuMakeParserTaskMangling();
void testXcodebuildParserParsing_data();
void testXcodebuildParserParsing();
void testMsvcOutputParsers_data();
void testMsvcOutputParsers();
......
......@@ -143,7 +143,8 @@ HEADERS += projectexplorer.h \
customparser.h \
customparserconfigdialog.h \
ipotentialkit.h \
selectablefilesmodel.h
selectablefilesmodel.h \
xcodebuildparser.h
SOURCES += projectexplorer.cpp \
abi.cpp \
......@@ -273,7 +274,8 @@ SOURCES += projectexplorer.cpp \
customparser.cpp \
customparserconfigdialog.cpp \
ipotentialkit.cpp \
selectablefilesmodel.cpp
selectablefilesmodel.cpp \
xcodebuildparser.cpp
FORMS += processstep.ui \
editorsettingspropertiespage.ui \
......
......@@ -143,7 +143,8 @@ QtcPlugin {
"toolchainmanager.cpp", "toolchainmanager.h",
"toolchainoptionspage.cpp", "toolchainoptionspage.h",
"unconfiguredprojectpanel.cpp", "unconfiguredprojectpanel.h",
"vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h"
"vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
"xcodebuildparser.cpp", "xcodebuildparser.h"
]
}
......
This diff is collapsed.
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef IOSXCODEPARSER_H
#define IOSXCODEPARSER_H
#include "projectexplorer_export.h"
#include "ioutputparser.h"
#include "devicesupport/idevice.h"
#include <QRegExp>
#include <QStringList>
namespace ProjectExplorer {
class PROJECTEXPLORER_EXPORT XcodebuildParser : public IOutputParser
{
Q_OBJECT
public:
enum XcodebuildStatus {
InXcodebuild,
OutsideXcodebuild,
UnknownXcodebuildState
};
XcodebuildParser();
void stdOutput(const QString &line);
void stdError(const QString &line);
bool hasFatalErrors() const;
private:
int m_fatalErrorCount;
QRegExp m_failureRe;
QRegExp m_successRe;
QRegExp m_buildRe;
XcodebuildStatus m_xcodeBuildParserState;
QString m_lastTarget;
QString m_lastProject;
#if defined WITH_TESTS
friend class ProjectExplorerPlugin;
#endif
};
#if defined WITH_TESTS
class XcodebuildParserTester : public QObject
{
Q_OBJECT
public:
explicit XcodebuildParserTester(XcodebuildParser *parser, QObject *parent = 0);
XcodebuildParser *parser;
};
#endif
} // namespace ProjectExplorer
#endif // IOSXCODEPARSER_H
......@@ -42,6 +42,7 @@
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/xcodebuildparser.h>
#include <utils/qtcprocess.h>
#include <QDir>
......@@ -255,6 +256,8 @@ bool MakeStep::init()
pp->resolveAll();
setOutputParser(new ProjectExplorer::GnuMakeParser());
if (tc && tc->targetAbi().os() == Abi::MacOS)
appendOutputParser(new XcodebuildParser);
IOutputParser *parser = target()->kit()->createOutputParser();
if (parser)
appendOutputParser(parser);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment