forked from qt-creator/qt-creator
Originally, the build manager used to run all build steps in a dedicated thread. Communication between the step and the manager happened via a QFutureInterface that was passed into the step's run() function. Later, new steps were added that operated asynchronously, so the build manager had to differentiate between the different kinds of steps for starting and stopping. These days, almost all build and deploy steps work asynchronously, which made the QFuture-based interface look increasingly odd. With this patch, all build steps are expected to work asynchronously, so the build manager no longer needs to differentiate. Steps are started and requested to stop via the run() and cancel() functions, respectively, and emit the finished() signal when they are done. Build step implementors no longer have to deal with a QFutureInterface. For steps whose implementation is inherently synchronous, the BuildStep base class offers a runInThread() function. Change-Id: If905c68b234c5a669f6e19f43142eaa57d594803 Reviewed-by: hjk <hjk@qt.io>
149 lines
5.2 KiB
C++
149 lines
5.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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/gnumakeparser.h>
|
|
#include <projectexplorer/kitinformation.h>
|
|
#include <projectexplorer/processparameters.h>
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
#include <projectexplorer/toolchain.h>
|
|
|
|
#include <utils/hostosinfo.h>
|
|
#include <utils/qtcprocess.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);
|
|
setWidgetExpandedByDefault(false);
|
|
setImmutable(true);
|
|
}
|
|
|
|
bool AndroidPackageInstallationStep::init()
|
|
{
|
|
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();
|
|
}
|
|
|
|
void AndroidPackageInstallationStep::doRun()
|
|
{
|
|
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);
|
|
emit finished(false);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
AbstractProcessStep::doRun();
|
|
}
|
|
|
|
BuildStepConfigWidget *AndroidPackageInstallationStep::createConfigWidget()
|
|
{
|
|
return new AndroidPackageInstallationStepWidget(this);
|
|
}
|
|
|
|
|
|
//
|
|
// AndroidPackageInstallationStepWidget
|
|
//
|
|
|
|
namespace Internal {
|
|
|
|
AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
|
|
: BuildStepConfigWidget(step)
|
|
{
|
|
setDisplayName(tr("Make install"));
|
|
setSummaryText("<b>" + tr("Make install") + "</b>");
|
|
}
|
|
|
|
//
|
|
// AndroidPackageInstallationStepFactory
|
|
//
|
|
|
|
AndroidPackageInstallationFactory::AndroidPackageInstallationFactory()
|
|
{
|
|
registerStep<AndroidPackageInstallationStep>(Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID);
|
|
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
|
|
setSupportedDeviceType(Android::Constants::ANDROID_DEVICE_TYPE);
|
|
setRepeatable(false);
|
|
setDisplayName(AndroidPackageInstallationStep::tr("Deploy to device"));
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Android
|