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

RemoteLinux: Use aspects directly in TarPackageCreationStep

Browse Source 
Change-Id: If9cdc95184cbf6ec72b326b41fafdd0240c5b060
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-13 12:30:59 +02:00
parent 4c02bc497c
commit ecd524f12b
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/remotelinux/tarpackagecreationstep.cpp
View File

@@ -29,9 +29,6 @@ using namespace Utils;
namespace RemoteLinux::Internal { namespace RemoteLinux::Internal {
const char IgnoreMissingFilesKey[] = "RemoteLinux.TarPackageCreationStep.IgnoreMissingFiles";
const char IncrementalDeploymentKey[] = "RemoteLinux.TarPackageCreationStep.IncrementalDeployment";
const int TarBlockSize = 512; const int TarBlockSize = 512;
struct TarFileHeader { struct TarFileHeader {
@@ -83,8 +80,8 @@ private:
FilePath m_tarFilePath; FilePath m_tarFilePath;
bool m_deploymentDataModified = false; bool m_deploymentDataModified = false;
DeploymentTimeInfo m_deployTimes; DeploymentTimeInfo m_deployTimes;
BoolAspect *m_incrementalDeploymentAspect = nullptr; BoolAspect m_incrementalDeployment{this};
BoolAspect *m_ignoreMissingFilesAspect = nullptr; BoolAspect m_ignoreMissingFiles{this};
bool m_packagingNeeded = false; bool m_packagingNeeded = false;
QList<DeployableFile> m_files; QList<DeployableFile> m_files;
@@ -99,15 +96,14 @@ TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Id id)
}); });
m_deploymentDataModified = true; m_deploymentDataModified = true;
m_ignoreMissingFilesAspect = addAspect<BoolAspect>(); m_incrementalDeployment.setSettingsKey(
m_ignoreMissingFilesAspect->setLabel(Tr::tr("Ignore missing files"), "RemoteLinux.TarPackageCreationStep.IncrementalDeployment");
BoolAspect::LabelPlacement::AtCheckBox); m_incrementalDeployment.setLabelText(Tr::tr("Package modified files only"));
m_ignoreMissingFilesAspect->setSettingsKey(IgnoreMissingFilesKey); m_incrementalDeployment.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
m_incrementalDeploymentAspect = addAspect<BoolAspect>(); m_ignoreMissingFiles.setSettingsKey("RemoteLinux.TarPackageCreationStep.IgnoreMissingFiles");
m_incrementalDeploymentAspect->setLabel(Tr::tr("Package modified files only"), m_ignoreMissingFiles.setLabelText(Tr::tr("Ignore missing files"));
BoolAspect::LabelPlacement::AtCheckBox); m_ignoreMissingFiles.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
m_incrementalDeploymentAspect->setSettingsKey(IncrementalDeploymentKey);
setSummaryUpdater([this] { setSummaryUpdater([this] {
FilePath path = packageFilePath(); FilePath path = packageFilePath();
@@ -137,7 +133,7 @@ void TarPackageCreationStep::doRun()
{ {
const QList<DeployableFile> &files = target()->deploymentData().allFiles(); const QList<DeployableFile> &files = target()->deploymentData().allFiles();
if (m_incrementalDeploymentAspect->value()) { if (m_incrementalDeployment()) {
m_files.clear(); m_files.clear();
for (const DeployableFile &file : files) for (const DeployableFile &file : files)
addNeededDeploymentFiles(file, kit()); addNeededDeploymentFiles(file, kit());
@@ -167,7 +163,7 @@ void TarPackageCreationStep::doRun()
this, &TarPackageCreationStep::deployFinished); this, &TarPackageCreationStep::deployFinished);
}); });
auto future = Utils::asyncRun(&TarPackageCreationStep::doPackage, this, auto future = Utils::asyncRun(&TarPackageCreationStep::doPackage, this,
m_tarFilePath, m_ignoreMissingFilesAspect->value()); m_tarFilePath, m_ignoreMissingFiles());
watcher->setFuture(future); watcher->setFuture(future);
m_synchronizer.addFuture(future); m_synchronizer.addFuture(future);
} }