class GenericDirectUploadServicePrivate
{
public:
- GenericDirectUploadServicePrivate() : stopRequested(false), state(Inactive) {}
+ GenericDirectUploadServicePrivate()
+ : incremental(false), stopRequested(false), state(Inactive) {}
+ bool incremental;
bool stopRequested;
State state;
QList<DeployableFile> filesToUpload;
m_d->deployableFiles = deployableFiles;
}
+void GenericDirectUploadService::setIncrementalDeployment(bool incremental)
+{
+ m_d->incremental = incremental;
+}
+
bool GenericDirectUploadService::isDeploymentNecessary() const
{
m_d->filesToUpload.clear();
handleDeploymentDone();
}
-// Note: time stamp checks disabled for now; it's too much hassle for the user to force
-// deployment in case the device has changed.
void GenericDirectUploadService::checkDeploymentNeeded(const DeployableFile &deployable) const
{
QFileInfo fileInfo(deployable.localFilePath);
if (fileInfo.isDir()) {
const QStringList files = QDir(deployable.localFilePath)
.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
- if (files.isEmpty() /* && hasChangedSinceLastDeployment(deployable) */)
+ if (files.isEmpty() && (!m_d->incremental || hasChangedSinceLastDeployment(deployable)))
m_d->filesToUpload << deployable;
foreach (const QString &fileName, files) {
const QString localFilePath = deployable.localFilePath
+ fileInfo.fileName();
checkDeploymentNeeded(DeployableFile(localFilePath, remoteDir));
}
- } else /* if (hasChangedSinceLastDeployment(deployable)) */ {
+ } else if (!m_d->incremental || hasChangedSinceLastDeployment(deployable)) {
m_d->filesToUpload << deployable;
}
}
#include "deploymentinfo.h"
#include "genericdirectuploadservice.h"
#include "remotelinuxdeployconfiguration.h"
+#include "remotelinuxdeploystepwidget.h"
+#include <QtGui/QCheckBox>
+#include <QtGui/QVBoxLayout>
#include <QtCore/QList>
#include <QtCore/QSharedPointer>
+using namespace ProjectExplorer;
+
namespace RemoteLinux {
namespace Internal {
+namespace {
+const char IncrementalKey[] = "RemoteLinux.GenericDirectUploadStep.Incremental";
+
+class ConfigWidget : public BuildStepConfigWidget
+{
+ Q_OBJECT
+public:
+ ConfigWidget(GenericDirectUploadStep *step) : m_widget(step)
+ {
+ m_incrementalCheckBox.setText(tr("Incremental deployment"));
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
+ mainLayout->setMargin(0);
+ mainLayout->addWidget(&m_widget);
+ mainLayout->addWidget(&m_incrementalCheckBox);
+ m_incrementalCheckBox.setChecked(step->incrementalDeployment());
+ connect(&m_widget, SIGNAL(updateSummary()), SIGNAL(updateSummary()));
+ connect(&m_incrementalCheckBox, SIGNAL(toggled(bool)),
+ SLOT(handleIncrementalChanged(bool)));
+ }
+
+private:
+ QString summaryText() const { return m_widget.summaryText(); }
+ QString displayName() const { return m_widget.displayName(); }
+
+ GenericDirectUploadStep *myStep() const {
+ return qobject_cast<GenericDirectUploadStep *>(m_widget.step());
+ }
+
+ Q_SLOT void handleIncrementalChanged(bool incremental) {
+ myStep()->setIncrementalDeployment(incremental);
+ }
+
+ RemoteLinuxDeployStepWidget m_widget;
+ QCheckBox m_incrementalCheckBox;
+};
+
+} // anonymous namespace
+
class GenericDirectUploadStepPrivate
{
public:
+ GenericDirectUploadStepPrivate() : incremental(true) {}
+
GenericDirectUploadService deployService;
+ bool incremental;
};
+
} // namespace Internal
GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const QString &id)
delete m_d;
}
+BuildStepConfigWidget *GenericDirectUploadStep::createConfigWidget()
+{
+ return new Internal::ConfigWidget(this);
+}
+
bool GenericDirectUploadStep::isDeploymentPossible(QString *whyNot) const
{
QList<DeployableFile> deployableFiles;
for (int i = 0; i < deployableCount; ++i)
deployableFiles << deploymentInfo->deployableAt(i);
m_d->deployService.setDeployableFiles(deployableFiles);
+ m_d->deployService.setIncrementalDeployment(incrementalDeployment());
return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
}
return &m_d->deployService;
}
+bool GenericDirectUploadStep::fromMap(const QVariantMap &map)
+{
+ if (!AbstractRemoteLinuxDeployStep::fromMap(map))
+ return false;
+ setIncrementalDeployment(map.value(QLatin1String(Internal::IncrementalKey), true).toBool());
+ return true;
+}
+
+QVariantMap GenericDirectUploadStep::toMap() const
+{
+ QVariantMap map = AbstractRemoteLinuxDeployStep::toMap();
+ map.insert(QLatin1String(Internal::IncrementalKey), incrementalDeployment());
+ return map;
+}
+
void GenericDirectUploadStep::ctor()
{
setDefaultDisplayName(displayName());
m_d = new Internal::GenericDirectUploadStepPrivate;
}
+void GenericDirectUploadStep::setIncrementalDeployment(bool incremental)
+{
+ m_d->incremental = incremental;
+}
+
+bool GenericDirectUploadStep::incrementalDeployment() const
+{
+ return m_d->incremental;
+}
+
QString GenericDirectUploadStep::stepId()
{
return QLatin1String("RemoteLinux.DirectUploadStep");
}
} //namespace RemoteLinux
+
+#include "genericdirectuploadstep.moc"