feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Stop build on fatal make errors

Browse Source 
... ignoring a error code of 0 from Make. This is necessary to
detect build failures on symbian

Do not show errors when ignoring the return value of a BuildStep
either.

Task-number: QTCREATORBUG-985
Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-04-09 15:04:20 +02:00
parent 8cf30e86df
commit 62e4c92f26
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/gnumakeparser.cpp
View File

@@ -43,7 +43,8 @@ namespace {
}
GnuMakeParser::GnuMakeParser(const QString &dir) :
m_suppressIssues(false)
m_suppressIssues(false),
m_fatalErrorCount(0)
{
m_makeDir.setPattern(QLatin1String(MAKE_PATTERN) +
QLatin1String("(\\w+) directory .(.+).$"));
@@ -55,6 +56,11 @@ GnuMakeParser::GnuMakeParser(const QString &dir) :
addDirectory(dir);
}
int GnuMakeParser::fatalErrors() const
{
return m_fatalErrorCount;
}
void GnuMakeParser::stdOutput(const QString &line)
{
QString lne = line.trimmed();
@@ -75,6 +81,7 @@ void GnuMakeParser::stdError(const QString &line)
QString lne = line.trimmed();
if (m_makefileError.indexIn(lne) > -1) {
++m_fatalErrorCount;
if (!m_suppressIssues) {
m_suppressIssues = true;
addTask(Task(Task::Error,
@@ -86,6 +93,7 @@ void GnuMakeParser::stdError(const QString &line)
return;
}
if (m_makeLine.indexIn(lne) > -1) {
++m_fatalErrorCount;
if (!m_suppressIssues) {
m_suppressIssues = true;
addTask(Task(Task::Error,