forked from qt-creator/qt-creator
QmakeAndroidSupport: Move AndroidPackageInstallationStep to Android plugin
There's nothing Qmake related in there (anymore?). Change-Id: I8842d4824065cf3cba61d50b6f333ec3b52e3851 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
166
src/plugins/android/androidpackageinstallationstep.cpp
Normal file
166
src/plugins/android/androidpackageinstallationstep.cpp
Normal file
@@ -0,0 +1,166 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** 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 The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "androidpackageinstallationstep.h"
|
||||
|
||||
#include "androidconstants.h"
|
||||
#include "androidmanager.h"
|
||||
|
||||
#include <projectexplorer/buildsteplist.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
#include <projectexplorer/toolchain.h>
|
||||
#include <projectexplorer/kitinformation.h>
|
||||
#include <projectexplorer/gnumakeparser.h>
|
||||
|
||||
#include <utils/hostosinfo.h>
|
||||
|
||||
#include <QDir>
|
||||
|
||||
using namespace ProjectExplorer;
|
||||
using namespace Utils;
|
||||
using namespace Android::Internal;
|
||||
|
||||
namespace Android {
|
||||
|
||||
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl)
|
||||
: AbstractProcessStep(bsl, Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID)
|
||||
{
|
||||
const QString name = tr("Copy application data");
|
||||
setDefaultDisplayName(name);
|
||||
setDisplayName(name);
|
||||
}
|
||||
|
||||
bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
QString dirPath = bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString();
|
||||
if (HostOsInfo::isWindowsHost())
|
||||
if (bc->environment().searchInPath("sh.exe").isEmpty())
|
||||
dirPath = QDir::toNativeSeparators(dirPath);
|
||||
|
||||
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(),
|
||||
ProjectExplorer::Constants::CXX_LANGUAGE_ID);
|
||||
|
||||
ProcessParameters *pp = processParameters();
|
||||
pp->setMacroExpander(bc->macroExpander());
|
||||
pp->setWorkingDirectory(bc->buildDirectory().toString());
|
||||
pp->setCommand(tc->makeCommand(bc->environment()));
|
||||
Environment env = bc->environment();
|
||||
Environment::setupEnglishOutput(&env);
|
||||
pp->setEnvironment(env);
|
||||
const QString innerQuoted = QtcProcess::quoteArg(dirPath);
|
||||
const QString outerQuoted = QtcProcess::quoteArg("INSTALL_ROOT=" + innerQuoted);
|
||||
pp->setArguments(outerQuoted + " install");
|
||||
|
||||
pp->resolveAll();
|
||||
setOutputParser(new GnuMakeParser());
|
||||
IOutputParser *parser = target()->kit()->createOutputParser();
|
||||
if (parser)
|
||||
appendOutputParser(parser);
|
||||
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
|
||||
|
||||
m_androidDirsToClean.clear();
|
||||
// don't remove gradle's cache, it takes ages to rebuild it.
|
||||
m_androidDirsToClean << dirPath + "/assets";
|
||||
m_androidDirsToClean << dirPath + "/libs";
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
}
|
||||
|
||||
void AndroidPackageInstallationStep::run(QFutureInterface<bool> &fi)
|
||||
{
|
||||
QString error;
|
||||
foreach (const QString &dir, m_androidDirsToClean) {
|
||||
FileName androidDir = FileName::fromString(dir);
|
||||
if (!dir.isEmpty() && androidDir.exists()) {
|
||||
emit addOutput(tr("Removing directory %1").arg(dir), OutputFormat::NormalMessage);
|
||||
if (!FileUtils::removeRecursively(androidDir, &error)) {
|
||||
emit addOutput(error, OutputFormat::Stderr);
|
||||
reportRunResult(fi, false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
AbstractProcessStep::run(fi);
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *AndroidPackageInstallationStep::createConfigWidget()
|
||||
{
|
||||
return new AndroidPackageInstallationStepWidget(this);
|
||||
}
|
||||
|
||||
|
||||
bool AndroidPackageInstallationStep::immutable() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
//
|
||||
// AndroidPackageInstallationStepWidget
|
||||
//
|
||||
|
||||
namespace Internal {
|
||||
|
||||
AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
|
||||
: m_step(step)
|
||||
{
|
||||
}
|
||||
|
||||
QString AndroidPackageInstallationStepWidget::summaryText() const
|
||||
{
|
||||
return tr("<b>Make install</b>");
|
||||
}
|
||||
|
||||
QString AndroidPackageInstallationStepWidget::displayName() const
|
||||
{
|
||||
return tr("Make install");
|
||||
}
|
||||
|
||||
bool AndroidPackageInstallationStepWidget::showWidget() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//
|
||||
// AndroidPackageInstallationStepFactory
|
||||
//
|
||||
|
||||
AndroidPackageInstallationFactory::AndroidPackageInstallationFactory()
|
||||
{
|
||||
registerStep<AndroidPackageInstallationStep>(Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID);
|
||||
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
|
||||
setRepeatable(false);
|
||||
setDisplayName(tr("Deploy to device"));
|
||||
}
|
||||
|
||||
bool AndroidPackageInstallationFactory::canHandle(BuildStepList *bsl) const
|
||||
{
|
||||
return BuildStepFactory::canHandle(bsl) && AndroidManager::supportsAndroid(bsl->target());
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Android
|
||||
Reference in New Issue
Block a user