diff options
author | Christian Kandeler <[email protected]> | 2019-01-25 14:26:34 +0100 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2019-01-31 16:10:01 +0000 |
commit | 966f4ea6a9d1e46833fc30df878ba6fa8f919988 (patch) | |
tree | 7f37c2adcf4dd6fe002585fb3b3c2815b21c5f26 /src/plugins/remotelinux/tarpackagecreationstep.h | |
parent | 536618b012b44b5ced428fc39600931803d5dd44 (diff) |
ProjectExplorer: Rework the build step run interface
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 <[email protected]>
Diffstat (limited to 'src/plugins/remotelinux/tarpackagecreationstep.h')
-rw-r--r-- | src/plugins/remotelinux/tarpackagecreationstep.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index 48dfc5bea27..1d359032bdf 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/src/plugins/remotelinux/tarpackagecreationstep.h @@ -48,9 +48,6 @@ public: static Core::Id stepId(); static QString displayName(); - bool init() override; - void run(QFutureInterface<bool> &fi) override; - void setIgnoreMissingFiles(bool ignoreMissingFiles); bool ignoreMissingFiles() const; @@ -58,6 +55,9 @@ public: bool isIncrementalDeployment() const; private: + bool init() override; + void doRun() override; + void deployFinished(bool success); void addNeededDeploymentFiles(const ProjectExplorer::DeployableFile &deployable, @@ -69,9 +69,10 @@ private: QString packageFileName() const override; - bool doPackage(QFutureInterface<bool> &fi); + bool runImpl(); + bool doPackage(); bool appendFile(QFile &tarFile, const QFileInfo &fileInfo, - const QString &remoteFilePath, const QFutureInterface<bool> &fi); + const QString &remoteFilePath); bool writeHeader(QFile &tarFile, const QFileInfo &fileInfo, const QString &remoteFilePath); |