From 5211256549d4ece7d40d883d0e52e49a72c2f477 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 22 Nov 2011 18:17:07 +0100
Subject: [PATCH] RemoteLinux: Don't make presence of device an absolute
prerequisite ...
... for deployment and running.
Rationale: An emulator might get started on-demand during deployment
and get auto-detected in the process.
Change-Id: Id95ccccbf4d570f9fa69a6ed3a8a473fd63c5968
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | 4 ++--
src/plugins/madde/maemodeploybymountsteps.cpp | 4 ++--
.../remotelinux/abstractremotelinuxdeploystep.cpp | 9 ++-------
src/plugins/remotelinux/abstractremotelinuxdeploystep.h | 2 +-
src/plugins/remotelinux/genericdirectuploadstep.cpp | 2 +-
.../remotelinuxcustomcommanddeploymentstep.cpp | 2 +-
.../remotelinux/remotelinuxcustomcommanddeployservice.h | 3 ++-
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 4 ----
.../remotelinux/uploadandinstalltarpackagestep.cpp | 2 +-
9 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index 25fa89bf0a2..67dbbda4c51 100644
--- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -155,7 +155,7 @@ bool MaemoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con
return false;
}
m_deployService->setPackageFilePath(pStep->packageFilePath());
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
QString MaemoUploadAndInstallPackageStep::stepId()
@@ -202,7 +202,7 @@ bool MeegoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con
return false;
}
m_deployService->setPackageFilePath(pStep->packageFilePath());
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
QString MeegoUploadAndInstallPackageStep::stepId()
diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index 97adf54ecd1..969daeb184d 100644
--- a/src/plugins/madde/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -430,7 +430,7 @@ bool MaemoInstallPackageViaMountStep::isDeploymentPossible(QString *whyNot) cons
return false;
}
m_deployService->setPackageFilePath(pStep->packageFilePath());
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
QString MaemoInstallPackageViaMountStep::stepId()
@@ -476,7 +476,7 @@ bool MaemoCopyFilesViaMountStep::isDeploymentPossible(QString *whyNot) const
for (int i = 0; i < deployableCount; ++i)
deployableFiles << deploymentInfo->deployableAt(i);
m_deployService->setDeployableFiles(deployableFiles);
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
QString MaemoCopyFilesViaMountStep::stepId()
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 97fffe3c7d8..9f3bcabe1b8 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -80,19 +80,14 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
bool AbstractRemoteLinuxDeployStep::init()
{
QString error;
+ deployService()->setDeviceConfiguration(deployConfiguration()->deviceConfiguration());
+ deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
const bool canDeploy = isDeploymentPossible(&error);
if (!canDeploy)
emit addOutput(tr("Deployment failed: %1").arg(error), ErrorMessageOutput);
return canDeploy;
}
-bool AbstractRemoteLinuxDeployStep::isDeploymentPossible(QString *whyNot) const
-{
- deployService()->setDeviceConfiguration(deployConfiguration()->deviceConfiguration());
- deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
- return deployService()->isDeploymentPossible(whyNot);
-}
-
void AbstractRemoteLinuxDeployStep::run(QFutureInterface<bool> &fi)
{
connect(deployService(), SIGNAL(errorMessage(QString)), SLOT(handleErrorMessage(QString)));
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 96fe6b316fc..fa4e8323edb 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -67,7 +67,7 @@ protected:
AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl,
AbstractRemoteLinuxDeployStep *other);
- virtual bool isDeploymentPossible(QString *whyNot = 0) const;
+ virtual bool isDeploymentPossible(QString *whyNot = 0) const = 0;
private slots:
void handleProgressMessage(const QString &message);
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 9c9ff6807ad..fe2afb4bd36 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -126,7 +126,7 @@ bool GenericDirectUploadStep::isDeploymentPossible(QString *whyNot) const
deployableFiles << deploymentInfo->deployableAt(i);
deployService()->setDeployableFiles(deployableFiles);
deployService()->setIncrementalDeployment(incrementalDeployment());
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
GenericDirectUploadService *GenericDirectUploadStep::deployService() const
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
index c9e2fe7b99a..d46979dedd2 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -154,7 +154,7 @@ QString AbstractRemoteLinuxCustomCommandDeploymentStep::commandLine() const
bool AbstractRemoteLinuxCustomCommandDeploymentStep::isDeploymentPossible(QString *whyNot) const
{
deployService()->setCommandLine(d->commandLine);
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return deployService()->isDeploymentPossible(whyNot);
}
BuildStepConfigWidget *AbstractRemoteLinuxCustomCommandDeploymentStep::createConfigWidget()
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
index 963f179eef6..0a9ae3c9e82 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
@@ -49,9 +49,10 @@ public:
void setCommandLine(const QString &commandLine);
-protected:
bool isDeploymentNecessary() const { return true; }
bool isDeploymentPossible(QString *whyNot = 0) const;
+
+protected:
void doDeviceSetup() { handleDeviceSetupDone(true); }
void stopDeviceSetup() { handleDeviceSetupDone(false); }
void doDeploy();
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 34ff7a4c559..758b57fc233 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -162,10 +162,6 @@ bool RemoteLinuxRunConfiguration::isEnabled() const
d->disabledReason = tr("The .pro file could not be parsed.");
return false;
}
- if (!deviceConfig()) {
- d->disabledReason = tr("No device configuration set.");
- return false;
- }
if (!activeQt4BuildConfiguration()) {
d->disabledReason = tr("No active build configuration.");
return false;
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index 2c7bfe3e8e8..5aff8dc4e91 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -96,7 +96,7 @@ bool UploadAndInstallTarPackageStep::isDeploymentPossible(QString *whyNot) const
return false;
}
m_deployService->setPackageFilePath(pStep->packageFilePath());
- return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+ return m_deployService->isDeploymentPossible(whyNot);
}
QString UploadAndInstallTarPackageStep::stepId()
--
GitLab