RemoteLinux: Merge tooling runworker related files

... and move definition of supported runconfig to worker factories

This might not be final, but is closer to the other device setups.

Change-Id: If68d4e9d1bfb281879ff8cd46ed6ed6356da8d57
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/plugins/remotelinux/CMakeLists.txt

@@ -25,7 +25,6 @@ add_qtc_plugin(RemoteLinux
     remotelinuxdeployconfiguration.cpp remotelinuxdeployconfiguration.h
     remotelinuxenvironmentaspect.cpp remotelinuxenvironmentaspect.h
     remotelinuxplugin.cpp remotelinuxplugin.h
-    remotelinuxqmltoolingsupport.cpp remotelinuxqmltoolingsupport.h
     remotelinuxrunconfiguration.cpp remotelinuxrunconfiguration.h
     remotelinuxsignaloperation.cpp remotelinuxsignaloperation.h
     rsyncdeploystep.cpp rsyncdeploystep.h

src/plugins/remotelinux/remotelinux.qbs

@@ -55,8 +55,6 @@ Project {
             "remotelinuxenvironmentaspect.h",
             "remotelinuxplugin.cpp",
             "remotelinuxplugin.h",
-            "remotelinuxqmltoolingsupport.cpp",
-            "remotelinuxqmltoolingsupport.h",
             "remotelinuxrunconfiguration.cpp",
             "remotelinuxrunconfiguration.h",
             "remotelinuxsignaloperation.cpp",

src/plugins/remotelinux/remotelinux_constants.h

@@ -21,5 +21,8 @@ const char KillAppStepId[] = "RemoteLinux.KillAppStep";
 
 const char SupportsRSync[] =  "RemoteLinux.SupportsRSync";
 
+const char RunConfigId[] = "RemoteLinuxRunConfiguration:";
+const char CustomRunConfigId[] = "RemoteLinux.CustomRunConfig";
+
 } // Constants
 } // RemoteLinux

src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp

@@ -84,7 +84,7 @@ Tasks RemoteLinuxCustomRunConfiguration::checkForIssues() const
 RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory()
     : FixedRunConfigurationFactory(Tr::tr("Custom Executable"), true)
 {
-    registerRunConfiguration<RemoteLinuxCustomRunConfiguration>("RemoteLinux.CustomRunConfig");
+    registerRunConfiguration<RemoteLinuxCustomRunConfiguration>(Constants::CustomRunConfigId);
     addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
 }
 

src/plugins/remotelinux/remotelinuxdebugsupport.cpp

@@ -10,15 +10,18 @@
 
 #include <debugger/debuggerruncontrol.h>
 
+#include <qmldebug/qmldebugcommandlinearguments.h>
+
 using namespace Debugger;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace RemoteLinux::Internal {
 
 class RemoteLinuxDebugWorker final : public DebuggerRunTool
 {
 public:
-    RemoteLinuxDebugWorker(RunControl *runControl)
+    explicit RemoteLinuxDebugWorker(RunControl *runControl)
         : DebuggerRunTool(runControl, DoNotAllowTerminal)
     {
         setId("RemoteLinuxDebugWorker");
@@ -38,22 +41,72 @@ public:
     }
 };
 
+class RemoteLinuxQmlToolingSupport final : public SimpleTargetRunner
+{
+public:
+    explicit RemoteLinuxQmlToolingSupport(RunControl *runControl)
+        : SimpleTargetRunner(runControl)
+    {
+        setId("RemoteLinuxQmlToolingSupport");
+
+        auto portsGatherer = new PortsGatherer(runControl);
+        addStartDependency(portsGatherer);
+
+        // The ports gatherer can safely be stopped once the process is running, even though it has to
+        // be started before.
+        addStopDependency(portsGatherer);
+
+        auto runworker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode()));
+        runworker->addStartDependency(this);
+        addStopDependency(runworker);
+
+        setStartModifier([this, runControl, portsGatherer, runworker] {
+            const QUrl serverUrl = portsGatherer->findEndPoint();
+            runworker->recordData("QmlServerUrl", serverUrl);
+
+            QmlDebug::QmlDebugServicesPreset services = QmlDebug::servicesForRunMode(runControl->runMode());
+
+            CommandLine cmd = commandLine();
+            cmd.addArg(QmlDebug::qmlDebugTcpArguments(services, serverUrl));
+            setCommandLine(cmd);
+        });
+    }
+};
+
 // Factories
 
-RemoteLinuxRunWorkerFactory::RemoteLinuxRunWorkerFactory(const QList<Utils::Id> &runConfigs)
+static const QList<Id> supportedRunConfigs()
+{
+    return {
+        Constants::RunConfigId,
+        Constants::CustomRunConfigId,
+        "QmlProjectManager.QmlRunConfiguration"
+    };
+}
+
+RemoteLinuxRunWorkerFactory::RemoteLinuxRunWorkerFactory()
 {
     setProduct<SimpleTargetRunner>();
     addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
-    setSupportedRunConfigs(runConfigs);
     addSupportedDeviceType(Constants::GenericLinuxOsType);
+    setSupportedRunConfigs(supportedRunConfigs());
 }
 
-RemoteLinuxDebugWorkerFactory::RemoteLinuxDebugWorkerFactory(const QList<Utils::Id> &runConfigs)
+RemoteLinuxDebugWorkerFactory::RemoteLinuxDebugWorkerFactory()
 {
     setProduct<RemoteLinuxDebugWorker>();
     addSupportedRunMode(ProjectExplorer::Constants::DEBUG_RUN_MODE);
-    setSupportedRunConfigs(runConfigs);
     addSupportedDeviceType(Constants::GenericLinuxOsType);
+    setSupportedRunConfigs(supportedRunConfigs());
 }
 
-} // Internal::Internal
+RemoteLinuxQmlToolingWorkerFactory::RemoteLinuxQmlToolingWorkerFactory()
+{
+    setProduct<RemoteLinuxQmlToolingSupport>();
+    addSupportedRunMode(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
+    addSupportedRunMode(ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE);
+    addSupportedDeviceType(Constants::GenericLinuxOsType);
+    setSupportedRunConfigs(supportedRunConfigs());
+}
+
+} // RemoteLinux::Internal

src/plugins/remotelinux/remotelinuxdebugsupport.h

@@ -10,13 +10,19 @@ namespace RemoteLinux::Internal {
 class RemoteLinuxRunWorkerFactory final : public ProjectExplorer::RunWorkerFactory
 {
 public:
-    explicit RemoteLinuxRunWorkerFactory(const QList<Utils::Id> &runConfigs);
+    explicit RemoteLinuxRunWorkerFactory();
 };
 
 class RemoteLinuxDebugWorkerFactory final : public ProjectExplorer::RunWorkerFactory
 {
 public:
-    explicit RemoteLinuxDebugWorkerFactory(const QList<Utils::Id> &runConfigs);
+    explicit RemoteLinuxDebugWorkerFactory();
+};
+
+class RemoteLinuxQmlToolingWorkerFactory final : public ProjectExplorer::RunWorkerFactory
+{
+public:
+    explicit RemoteLinuxQmlToolingWorkerFactory();
 };
 
 } // RemoteLinux::Internal

src/plugins/remotelinux/remotelinuxplugin.cpp

@@ -10,7 +10,6 @@
 #include "makeinstallstep.h"
 #include "remotelinux_constants.h"
 #include "remotelinuxdeployconfiguration.h"
-#include "remotelinuxqmltoolingsupport.h"
 #include "remotelinuxcustomrunconfiguration.h"
 #include "remotelinuxdebugsupport.h"
 #include "remotelinuxdeployconfiguration.h"
@@ -62,15 +61,9 @@ public:
     CustomCommandDeployStepFactory customCommandDeployStepFactory;
     KillAppStepFactory killAppStepFactory;
     GenericDeployStepFactory<MakeInstallStep> makeInstallStepFactory;
-
-    const QList<Utils::Id> supportedRunConfigs {
-        runConfigurationFactory.runConfigurationId(),
-        customRunConfigurationFactory.runConfigurationId(),
-        "QmlProjectManager.QmlRunConfiguration"
-    };
-    RemoteLinuxRunWorkerFactory runWorkerFactory{supportedRunConfigs};
-    RemoteLinuxDebugWorkerFactory debugWorkerFactory{supportedRunConfigs};
-    RemoteLinuxQmlToolingWorkerFactory qmlToolingWorkerFactory{supportedRunConfigs};
+    RemoteLinuxRunWorkerFactory runWorkerFactory;
+    RemoteLinuxDebugWorkerFactory debugWorkerFactory;
+    RemoteLinuxQmlToolingWorkerFactory qmlToolingWorkerFactory;
 };
 
 static RemoteLinuxPluginPrivate *dd = nullptr;

src/plugins/remotelinux/remotelinuxqmltoolingsupport.cpp

@@ -1,59 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "remotelinuxqmltoolingsupport.h"
-
-#include "remotelinux_constants.h"
-
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
-
-#include <qmldebug/qmldebugcommandlinearguments.h>
-
-using namespace ProjectExplorer;
-using namespace Utils;
-
-namespace RemoteLinux::Internal {
-
-class RemoteLinuxQmlToolingSupport : public SimpleTargetRunner
-{
-public:
-    explicit RemoteLinuxQmlToolingSupport(RunControl *runControl)
-        : SimpleTargetRunner(runControl)
-    {
-        setId("RemoteLinuxQmlToolingSupport");
-
-        auto portsGatherer = new PortsGatherer(runControl);
-        addStartDependency(portsGatherer);
-
-        // The ports gatherer can safely be stopped once the process is running, even though it has to
-        // be started before.
-        addStopDependency(portsGatherer);
-
-        auto runworker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode()));
-        runworker->addStartDependency(this);
-        addStopDependency(runworker);
-
-        setStartModifier([this, runControl, portsGatherer, runworker] {
-            const QUrl serverUrl = portsGatherer->findEndPoint();
-            runworker->recordData("QmlServerUrl", serverUrl);
-
-            QmlDebug::QmlDebugServicesPreset services = QmlDebug::servicesForRunMode(runControl->runMode());
-
-            CommandLine cmd = commandLine();
-            cmd.addArg(QmlDebug::qmlDebugTcpArguments(services, serverUrl));
-            setCommandLine(cmd);
-        });
-    }
-};
-
-RemoteLinuxQmlToolingWorkerFactory::RemoteLinuxQmlToolingWorkerFactory(const QList<Utils::Id> &runConfigs)
-{
-    setProduct<RemoteLinuxQmlToolingSupport>();
-    addSupportedRunMode(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
-    addSupportedRunMode(ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE);
-    setSupportedRunConfigs(runConfigs);
-    addSupportedDeviceType(Constants::GenericLinuxOsType);
-}
-
-} // RemoteLinux::Internal

src/plugins/remotelinux/remotelinuxqmltoolingsupport.h

@@ -1,16 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <projectexplorer/runcontrol.h>
-
-namespace RemoteLinux::Internal {
-
-class RemoteLinuxQmlToolingWorkerFactory final : public ProjectExplorer::RunWorkerFactory
-{
-public:
-    explicit RemoteLinuxQmlToolingWorkerFactory(const QList<Utils::Id> &runConfigs);
-};
-
-} // RemoteLinux::Internal

src/plugins/remotelinux/remotelinuxrunconfiguration.cpp

@@ -90,7 +90,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Id id)
 
 RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory()
 {
-    registerRunConfiguration<RemoteLinuxRunConfiguration>("RemoteLinuxRunConfiguration:");
+    registerRunConfiguration<RemoteLinuxRunConfiguration>(Constants::RunConfigId);
     setDecorateDisplayNames(true);
     addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
 }