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

Android: Remove old android directory before deployment

Browse Source 
Task-number: QTCREATORBUG-10290

Change-Id: I83a3ccef58ab1a4c2a486f20620a11e318c146ca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-10-10 16:30:56 +02:00
parent 421aecfb54
commit 04cd026582
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -94,6 +94,8 @@ bool AndroidPackageInstallationStep::init()
appendOutputParser(parser);
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
m_androidDirToClean = m_androidDirectory == BuildDirectory ? dirPath : QString();
return AbstractProcessStep::init();
}
@@ -105,6 +107,22 @@ bool AndroidPackageInstallationStep::fromMap(const QVariantMap &map)
return true;
}
void AndroidPackageInstallationStep::run(QFutureInterface<bool> &fi)
{
QString error;
Utils::FileName androidDir = Utils::FileName::fromString(m_androidDirToClean);
if (!m_androidDirToClean.isEmpty()&& androidDir.toFileInfo().exists()) {
emit addOutput(tr("Removing directory %1").arg(m_androidDirToClean), MessageOutput);
if (!Utils::FileUtils::removeRecursively(androidDir, &error)) {
emit addOutput(error, ErrorOutput);
fi.reportResult(false);
emit finished();
return;
}
}
AbstractProcessStep::run(fi);
}
QVariantMap AndroidPackageInstallationStep::toMap() const
{
QVariantMap map = AbstractProcessStep::toMap();