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

RemoteLinux: Un-publish MakeInstallStep

Browse Source 
... and move definition into .cpp.

It is by now only needed there, and we don't want to encourge
re-using bits and pieces of step implementation by inheritance.

Change-Id: I12899c5e6a6c94cc9cfb23a2756621a4213f5dae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-03 17:09:00 +02:00
parent f2aaf68b0c
commit 1e6eb1ba28
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -12,6 +12,7 @@
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/makestep.h>
#include <projectexplorer/processparameters.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/runconfigurationaspects.h>
@@ -23,8 +24,6 @@
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <QDirIterator>
#include <QFileInfo>
#include <QSet>
#include <QTemporaryDir>
@@ -39,6 +38,33 @@ const char CleanInstallRootAspectId[] = "RemoteLinux.MakeInstall.CleanInstallRoo
const char FullCommandLineAspectId[] = "RemoteLinux.MakeInstall.FullCommandLine";
const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandLine";
class MakeInstallStep : public MakeStep
{
public:
MakeInstallStep(BuildStepList *parent, Id id);
private:
bool fromMap(const QVariantMap &map) override;
QWidget *createConfigWidget() override;
bool init() override;
void finish(ProcessResult result) override;
bool isJobCountSupported() const override { return false; }
FilePath installRoot() const;
bool cleanInstallRoot() const;
void updateCommandFromAspect();
void updateArgsFromAspect();
void updateFullCommandLine();
void updateFromCustomCommandLineAspect();
StringAspect *customCommandLineAspect() const;
DeploymentData m_deploymentData;
bool m_noInstallTarget = false;
bool m_isCmakeProject = false;
};
MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent, id)
{
m_makeCommandAspect.setVisible(false);

31
src/plugins/remotelinux/makeinstallstep.h
View File

@@ -5,39 +5,10 @@
#include "remotelinux_export.h"
#include <projectexplorer/deploymentdata.h>
#include <projectexplorer/makestep.h>
#include <projectexplorer/buildstep.h>
namespace RemoteLinux {
class REMOTELINUX_EXPORT MakeInstallStep : public ProjectExplorer::MakeStep
{
Q_OBJECT
public:
MakeInstallStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
private:
bool fromMap(const QVariantMap &map) override;
QWidget *createConfigWidget() override;
bool init() override;
void finish(Utils::ProcessResult result) override;
bool isJobCountSupported() const override { return false; }
Utils::FilePath installRoot() const;
bool cleanInstallRoot() const;
void updateCommandFromAspect();
void updateArgsFromAspect();
void updateFullCommandLine();
void updateFromCustomCommandLineAspect();
Utils::StringAspect *customCommandLineAspect() const;
ProjectExplorer::DeploymentData m_deploymentData;
bool m_noInstallTarget = false;
bool m_isCmakeProject = false;
};
class REMOTELINUX_EXPORT MakeInstallStepFactory
: public ProjectExplorer::BuildStepFactory
{