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

BuildStep: Make it possible to run with task tree

Browse Source 
Move the doRun() implementation from AbstractProcessStep
and from AbstractRemoteLinuxDeployStep into BuildStep.
Do the same with doCancel().

Task-number: QTCREATORBUG-29168
Change-Id: I767f73dc7408d7c5a9fe9821da92e664cf1ed8f3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-12 23:15:26 +02:00
parent f7afa52106
commit d7a232331a
6 changed files with 65 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -29,7 +29,6 @@ public:
std::function<expected_str<void>()> internalInit;
DeploymentTimeInfo deployTimes;
std::unique_ptr<TaskTree> m_taskTree;
};
} // Internal
@@ -38,7 +37,9 @@ using namespace Internal;
AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, Id id)
: BuildStep(bsl, id), d(new AbstractRemoteLinuxDeployStepPrivate)
{}
{
setCancelMessage(Tr::tr("User requests deployment to stop; cleaning up."));
}
AbstractRemoteLinuxDeployStep::~AbstractRemoteLinuxDeployStep()
{
@@ -99,6 +100,8 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
bool AbstractRemoteLinuxDeployStep::init()
{
QTC_ASSERT(d->internalInit, return false);
if (!BuildStep::init())
return false;
const auto canDeploy = d->internalInit();
if (!canDeploy) {
emit addOutput(Tr::tr("Cannot deploy: %1").arg(canDeploy.error()),
@@ -107,35 +110,6 @@ bool AbstractRemoteLinuxDeployStep::init()
return bool(canDeploy);
}
void AbstractRemoteLinuxDeployStep::doRun()
{
QTC_ASSERT(!d->m_taskTree, return);
d->m_taskTree.reset(new TaskTree({runRecipe()}));
const auto onDone = [this] {
d->m_taskTree.release()->deleteLater();
emit finished(true);
};
const auto onError = [this] {
d->m_taskTree.release()->deleteLater();
emit finished(false);
};
connect(d->m_taskTree.get(), &TaskTree::done, this, onDone);
connect(d->m_taskTree.get(), &TaskTree::errorOccurred, this, onError);
d->m_taskTree->start();
}
void AbstractRemoteLinuxDeployStep::doCancel()
{
if (!d->m_taskTree)
return;
d->m_taskTree.reset();
emit addOutput(Tr::tr("User requests deployment to stop; cleaning up."),
OutputFormat::NormalMessage);
emit finished(false);
}
void AbstractRemoteLinuxDeployStep::addProgressMessage(const QString &message)
{
emit addOutput(message, OutputFormat::NormalMessage);