forked from qt-creator/qt-creator
Harmattan: Support deploying without packaging.
Won't work out of the box with the default paths from our wizards, but developers might find the faster turn-around time worth the hassle. Task-number: QTCREATORBUG-5459 Change-Id: I21dbc67f940f2e68cf07f28568ea35c717abc294 Reviewed-on: http://codereview.qt.nokia.com/1828 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
@@ -81,6 +81,8 @@ QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent)
|
||||
ids << MaemoInstallRpmPackageToSysrootStep::Id;
|
||||
ids << MaemoUploadAndInstallRpmPackageStep::Id;
|
||||
}
|
||||
if (qobject_cast<Qt4HarmattanTarget *>(parent->target()))
|
||||
ids << MaemoDirectDeviceUploadStep::Id;
|
||||
if (qobject_cast<Qt4Maemo5Target *>(parent->target())) {
|
||||
ids << MaemoMountAndInstallDeployStep::Id
|
||||
<< MaemoMountAndCopyDeployStep::Id;
|
||||
|
||||
@@ -217,6 +217,15 @@ void MaemoDirectDeviceUploadStep::handleUploadFinished(Utils::SftpJobId jobId,
|
||||
setFinished();
|
||||
} else {
|
||||
setDeployed(connection()->connectionParameters().host, d);
|
||||
|
||||
// Terrible hack for Windows.
|
||||
if (d.remoteDir.contains(QLatin1String("bin"))) {
|
||||
const QString remoteFilePath = d.remoteDir + QLatin1Char('/')
|
||||
+ QFileInfo(d.localFilePath).fileName();
|
||||
const QString command = QLatin1String("chmod a+x ") + remoteFilePath;
|
||||
connection()->createRemoteProcess(command.toUtf8())->start();
|
||||
}
|
||||
|
||||
uploadNextFile();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user