Commit Graph

18 Commits

Author SHA1 Message Date
Jarek Kobus
97a66067bb TaskTree: Prepare for de-utils-ization - part 2
Move TaskTree into Tasking namespace.
Move Tasking namespace out of Utils namespace.

Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:19 +00:00
hjk
c6b6e5b0c6 RemoteLinux: Drop some in-class signalling
Not needed since the deploy step and service hierarchy merge.

Change-Id: I644bdeca31caa2182b9d618e5f1ec6865c95f4c8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-03-23 07:22:50 +00:00
hjk
a4ed630c7d RemoteLinux/Boot2Qt: Merge DeployStep and DeployService hierarchies
They were 1:1 now.

The change here is as small as possible, there are quite a few places
to clean up left.

Change-Id: I4f78d1de857b93d8372e2592a7723b02fe2fc947
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-03-23 07:16:54 +00:00
hjk
930cbdf68b RemoteLinux: Merge abstractremotelinuxdeploy{step,service} file pairs
Plan is to merge the class hierarchies, this is a mechanical first step.

Change-Id: I163578297a4badb5b8c861283f0d6a44c25f124f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-27 12:30:20 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Jarek Kobus
f2f1b7c2d7 AbstractRemoteLinuxDeployService: Refactor API
Instead of implementing two virtual methods:
- doDeploy
- stopDeployment
provide just one to be implemented:
- deployRecipe

The new method returns task tree description enclosed in
Group recipe. The abstract deploy service constructs the
TaskTree when needed, applies the recipe and starts the tree.

Change-Id: I36e52935f98736dafeea6be32fde5595410db077
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-25 13:33:47 +00:00
Jarek Kobus
2853d39065 KillAppService: Reuse TaskTree
Change-Id: I250542724d537219a8c1ce222d7e941474671adf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-25 13:18:16 +00:00
Jarek Kobus
822e2a224a KillAppService: Some cleanup
Remove undefined and unused handleStdErr() and
handleProcessFinished() methods.

Remove cleanup() and finishDeployment() methods
and move the implementation into stopDeployment().

Change-Id: I983e4513c4bcba45638eb054b389783ec4f73367
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-22 15:23:39 +00:00
Jarek Kobus
8dc13379dd KillAppService: Use queued connection for signal operation
Otherwise the m_signalOperation may be deleted directly
from it's signal handler.

Change-Id: I38ae09ac8b2cb936459592b006c5330fbfa3027c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-22 14:54:21 +00:00
Jarek Kobus
0312bfc066 KillAppService: Don't call cleanup() from d'tor
It's being done implicitly by QSharedPointer d'tor.

Change-Id: I058dd3e1c06eb92fad4ea8b5d43ee4d1da9182c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-22 10:49:31 +00:00
hjk
9e4eabb410 RemoteLinux: Dissolve AbstractRemoteLinuxDeployStep::createDeployService
The previous setup doesn't buy much in comparison to new + setDeployService()
combo. Making that explicit now opens the path to simplify the two-phase
creation (i.e. move setInternalInitializer to the service c'tor).

Change-Id: Ib66c7d02efcddd6909fe612a786034e2728cdedf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-14 09:12:40 +00:00
hjk
9434567cdb RemoteLinux: Propagate FilePath a bit further in KillAppStep
Change-Id: I566ab0a10dea4ad31909ee10810a982b4a216d67
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-08 10:21:43 +00:00
Eike Ziller
9c708b79ce Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/remotelinux/killappstep.cpp

Change-Id: I4360e7d0f2c2ac258613933de81e8a9c40387379
2022-09-02 10:12:40 +02:00
hjk
e4bc08fb21 RemoteLinux: Fix KillAppStep
Was taking .toString() instead of .path() of the executable FilePath.

Fixes: QTCREATORBUG-28124
Change-Id: I6286585393593cf97cbb2aeb5dbdd7c48bc95dbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-01 06:58:44 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
hjk
95c1f37a31 RemoteLinux: Reduce visibility of KillAppStep
Change-Id: Ib90a25ea5d3f2c7636aa099c87a3f71721ab9ea6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-04 11:11:13 +00:00
Jarek Kobus
6698c4dff0 RemoteLinux: Add more forward declarations
Change-Id: Ie1182248e3b423ce3b85a2baf0c2d7be74de1126
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-01 13:05:10 +00:00
Jarek Kobus
faa9ddbcfd Hide RemoteLinuxKillAppService
There is not need to export this class as it's not used
outside. Rename RemoteLinuxKillAppStep into KillAppStep,
as the "RemoteLinux" prefix is redundant inside RemoteLinux
plugin.

Change-Id: I46800c84fd326bb0631b77e48243443d79bc2fb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-30 09:20:18 +00:00