From a1e5884646929f500a55919067abaafc653e092f Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 24 Jul 2009 17:17:13 +0200
Subject: [PATCH] Use the new launcher for starting application on device
Not much error reporting etc yet. Application TRK needs to be
running on device.
---
.../qt4projectmanager/qt-s60/qt-s60-todo.txt | 3 +-
.../qt-s60/s60devicerunconfiguration.cpp | 46 +++++++++++++++++--
.../qt-s60/s60devicerunconfiguration.h | 6 +++
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
index 45b879216eb..e0c197c7eee 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
@@ -26,8 +26,7 @@
* auto-create run configurations the first time s60 qt is selected.
* Run on device
- * makesis, signsis and applicationinstaller don't report errors back
- via exit code :-(
+ * Finish runner when application exits
* passphrase for signing
* Add compile output parser winscw at least
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index e9eaddf69ef..91a22bab6a1 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -108,6 +108,12 @@ void S60DeviceRunConfiguration::restore(const PersistentSettingsReader &reader)
m_customKeyPath = reader.restoreValue("CustomKeyPath").toString();
}
+QString S60DeviceRunConfiguration::targetName() const
+{
+ const_cast<S60DeviceRunConfiguration *>(this)->updateTarget();
+ return m_targetName;
+}
+
QString S60DeviceRunConfiguration::basePackageFilePath() const
{
const_cast<S60DeviceRunConfiguration *>(this)->updateTarget();
@@ -200,7 +206,8 @@ void S60DeviceRunConfiguration::updateTarget()
m_workingDir = baseDir;
}
- m_baseFileName = QDir::cleanPath(m_workingDir + QLatin1Char('/') + reader->value("TARGET"));
+ m_targetName = reader->value("TARGET");
+ m_baseFileName = QDir::cleanPath(m_workingDir + QLatin1Char('/') + m_targetName);
if (pro->toolChainType(pro->activeBuildConfiguration()) == ToolChain::GCCE)
m_baseFileName += "_gcce";
@@ -433,6 +440,15 @@ S60DeviceRunControl::S60DeviceRunControl(QSharedPointer<RunConfiguration> runCon
this, SLOT(installProcessFailed()));
connect(m_install, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SLOT(installProcessFinished()));
+ m_run = new QProcess(this);
+ connect(m_run, SIGNAL(readyReadStandardError()),
+ this, SLOT(readStandardError()));
+ connect(m_run, SIGNAL(readyReadStandardOutput()),
+ this, SLOT(readStandardOutput()));
+ connect(m_run, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(runProcessFailed()));
+ connect(m_run, SIGNAL(finished(int,QProcess::ExitStatus)),
+ this, SLOT(runProcessFinished()));
}
void S60DeviceRunControl::start()
@@ -442,6 +458,7 @@ void S60DeviceRunControl::start()
Qt4Project *project = qobject_cast<Qt4Project *>(rc->project());
+ m_targetName = rc->targetName();
m_baseFileName = rc->basePackageFilePath();
m_workingDirectory = QFileInfo(m_baseFileName).absolutePath();
m_qtDir = project->qtVersion(project->activeBuildConfiguration())->path();
@@ -470,7 +487,10 @@ void S60DeviceRunControl::start()
void S60DeviceRunControl::stop()
{
- // TODO
+ m_makesis->kill();
+ m_signsis->kill();
+ m_install->kill();
+ m_run->kill();
}
bool S60DeviceRunControl::isRunning() const
@@ -548,7 +568,27 @@ void S60DeviceRunControl::installProcessFailed()
void S60DeviceRunControl::installProcessFinished()
{
if (m_install->exitCode() != 0) {
- error(this, tr("An error occurred while creating the package."));
+ error(this, tr("An error occurred while installing the package."));
+ emit finished();
+ return;
+ }
+ QString trklauncher = QApplication::applicationDirPath() + "/../tests/manual/trk/debug/trklauncher.exe";
+ QStringList arguments;
+ arguments << "COM5" << QString("C:\\sys\\bin\\%1.exe").arg(m_targetName); //TODO com selection and file path
+ emit addToOutputWindow(this, tr("%1 %2").arg(QDir::toNativeSeparators(trklauncher), arguments.join(tr(" "))));
+ m_run->start(trklauncher, arguments, QIODevice::ReadOnly);
+}
+
+void S60DeviceRunControl::runProcessFailed()
+{
+ processFailed("trklauncher", m_run->error());
+ error(this, tr("Did you compile the trklauncher application in tests\\manual\\trk ?"));
+}
+
+void S60DeviceRunControl::runProcessFinished()
+{
+ if (m_run->exitCode() != 0) {
+ error(this, tr("An error occurred while starting the application."));
}
emit addToOutputWindow(this, tr("Finished."));
emit finished();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 5cf304a0b96..63491f2959e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -58,6 +58,7 @@ public:
void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
void restore(const ProjectExplorer::PersistentSettingsReader &reader);
+ QString targetName() const;
QString basePackageFilePath() const;
SigningMode signingMode() const;
void setSigningMode(SigningMode mode);
@@ -76,6 +77,7 @@ private:
void updateTarget();
QString m_proFilePath;
+ QString m_targetName;
QString m_baseFileName;
bool m_cachedTargetInformationValid;
SigningMode m_signingMode;
@@ -147,10 +149,13 @@ private slots:
void signsisProcessFinished();
void installProcessFailed();
void installProcessFinished();
+ void runProcessFailed();
+ void runProcessFinished();
private:
void processFailed(const QString &program, QProcess::ProcessError errorCode);
+ QString m_targetName;
QString m_baseFileName;
QString m_workingDirectory;
QString m_toolsDirectory;
@@ -161,6 +166,7 @@ private:
QProcess *m_makesis;
QProcess *m_signsis;
QProcess *m_install;
+ QProcess *m_run;
};
} // namespace Internal
--
GitLab