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

RemoteLinux: Skip initial rsync step for remote build == run

Browse Source 
Change-Id: I4d02b666fe10adf38513939255314682222cc82e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-10-13 14:20:34 +02:00
parent 541ddd1ff7
commit b2fb86f3af
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
View File

@@ -40,8 +40,13 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
addInitialStep(Constants::MakeInstallStepId, needsMakeInstall); addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
addInitialStep(Constants::KillAppStepId); addInitialStep(Constants::KillAppStepId);
addInitialStep(Constants::RsyncDeployStepId, [](Target *target) { addInitialStep(Constants::RsyncDeployStepId, [](Target *target) {
auto device = DeviceKitAspect::device(target->kit()); auto runDevice = DeviceKitAspect::device(target->kit());
return device && device->extraData(Constants::SupportsRSync).toBool(); auto buildDevice = BuildDeviceKitAspect::device(target->kit());
if (runDevice == buildDevice)
return false;
// FIXME: That's not the full truth, we need support from the build
// device, too.
return runDevice && runDevice->extraData(Constants::SupportsRSync).toBool();
}); });
addInitialStep(Constants::DirectUploadStepId, [](Target *target) { addInitialStep(Constants::DirectUploadStepId, [](Target *target) {
auto device = DeviceKitAspect::device(target->kit()); auto device = DeviceKitAspect::device(target->kit());