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

Android: Show complete output of ant run

Browse Source 
Change-Id: I4964e5bf22a715375a7fa080604d16692c956fc2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-06-06 17:00:46 +02:00
parent 8011d0c32b
commit 8127ebe244
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -818,6 +818,10 @@ bool AndroidPackageCreationStep::runCommand(QProcess *buildProc
return false; return false;
} }
buildProc->waitForFinished(-1); buildProc->waitForFinished(-1);
handleProcessOutput(buildProc, false);
handleProcessOutput(buildProc, true);
if (buildProc->error() != QProcess::UnknownError if (buildProc->error() != QProcess::UnknownError
|| buildProc->exitCode() != 0) { || buildProc->exitCode() != 0) {
QString mainMessage = tr("Packaging Error: Command '%1 %2' failed.") QString mainMessage = tr("Packaging Error: Command '%1 %2' failed.")
@@ -837,13 +841,7 @@ void AndroidPackageCreationStep::handleBuildStdOutOutput()
QProcess *const process = qobject_cast<QProcess *>(sender()); QProcess *const process = qobject_cast<QProcess *>(sender());
if (!process) if (!process)
return; return;
handleProcessOutput(process, false);
process->setReadChannel(QProcess::StandardOutput);
while (process->canReadLine()) {
QString line = QString::fromLocal8Bit(process->readLine());
m_outputParser.stdOutput(line);
emit addOutput(line, BuildStep::NormalOutput, BuildStep::DontAppendNewline);
}
} }
void AndroidPackageCreationStep::handleBuildStdErrOutput() void AndroidPackageCreationStep::handleBuildStdErrOutput()
@@ -852,11 +850,21 @@ void AndroidPackageCreationStep::handleBuildStdErrOutput()
if (!process) if (!process)
return; return;
process->setReadChannel(QProcess::StandardError); handleProcessOutput(process, true);
}
void AndroidPackageCreationStep::handleProcessOutput(QProcess *process, bool stdErr)
{
process->setReadChannel(stdErr ? QProcess::StandardError : QProcess::StandardOutput);
while (process->canReadLine()) { while (process->canReadLine()) {
QString line = QString::fromLocal8Bit(process->readLine()); QString line = QString::fromLocal8Bit(process->readLine());
m_outputParser.stdError(line); if (stdErr)
emit addOutput(line, BuildStep::ErrorOutput, BuildStep::DontAppendNewline); m_outputParser.stdError(line);
else
m_outputParser.stdOutput(line);
emit addOutput(line, stdErr ? BuildStep::ErrorOutput
: BuildStep::NormalOutput,
BuildStep::DontAppendNewline);
} }
} }

1
src/plugins/android/androidpackagecreationstep.h
View File

@@ -113,6 +113,7 @@ private:
static const Core::Id CreatePackageId; static const Core::Id CreatePackageId;
private: private:
void handleProcessOutput(QProcess *process, bool stdErr);
Utils::FileName m_keystorePath; Utils::FileName m_keystorePath;
QString m_keystorePasswd; QString m_keystorePasswd;
QString m_certificateAlias; QString m_certificateAlias;