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

RemoteLinux: Rename RsyncDeployStep into GenericDeployStep

Browse Source 
It's handling several options nowadays.

Change-Id: Iee599489521c7cb6fa7ec5e28739f7a5ef9bbd8e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-10-05 17:48:47 +02:00
parent 1700355534
commit 5b8b585d04
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/remotelinux/rsyncdeploystep.cpp
View File

@@ -30,10 +30,10 @@ namespace RemoteLinux::Internal {
// RsyncDeployStep
class RsyncDeployStep : public AbstractRemoteLinuxDeployStep
class GenericDeployStep : public AbstractRemoteLinuxDeployStep
{
public:
RsyncDeployStep(BuildStepList *bsl, Id id)
GenericDeployStep(BuildStepList *bsl, Id id)
: AbstractRemoteLinuxDeployStep(bsl, id)
{
flags.setDisplayStyle(StringAspect::LineEditDisplay);
@@ -75,7 +75,7 @@ private:
mutable FilesToTransfer m_files;
};
bool RsyncDeployStep::isDeploymentNecessary() const
bool GenericDeployStep::isDeploymentNecessary() const
{
const QList<DeployableFile> files = target()->deploymentData().allFiles();
m_files.clear();
@@ -86,7 +86,7 @@ bool RsyncDeployStep::isDeploymentNecessary() const
return !m_files.empty();
}
GroupItem RsyncDeployStep::mkdirTask()
GroupItem GenericDeployStep::mkdirTask()
{
using ResultType = expected_str<void>;
@@ -147,7 +147,7 @@ static FileTransferMethod supportedTransferMethodFor(const FileToTransfer &fileT
return FileTransferMethod::GenericCopy;
}
GroupItem RsyncDeployStep::transferTask()
GroupItem GenericDeployStep::transferTask()
{
const auto setupHandler = [this](FileTransfer &transfer) {
FileTransferMethod preferredTransferMethod = FileTransferMethod::Rsync;
@@ -176,7 +176,7 @@ GroupItem RsyncDeployStep::transferTask()
transfer.setRsyncFlags(flags());
transfer.setFilesToTransfer(m_files);
connect(&transfer, &FileTransfer::progress, this, &RsyncDeployStep::handleStdOutData);
connect(&transfer, &FileTransfer::progress, this, &GenericDeployStep::handleStdOutData);
};
const auto errorHandler = [this](const FileTransfer &transfer) {
const ProcessResultData result = transfer.resultData();
@@ -192,16 +192,16 @@ GroupItem RsyncDeployStep::transferTask()
return FileTransferTask(setupHandler, {}, errorHandler);
}
GroupItem RsyncDeployStep::deployRecipe()
GroupItem GenericDeployStep::deployRecipe()
{
return Group { mkdirTask(), transferTask() };
}
// Factory
RsyncDeployStepFactory::RsyncDeployStepFactory()
GenericDeployStepFactory::GenericDeployStepFactory()
{
registerStep<RsyncDeployStep>(Constants::RsyncDeployStepId);
registerStep<GenericDeployStep>(Constants::GenericDeployStepId);
setDisplayName(Tr::tr("Deploy files"));
}