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

iOS 17: Print messages for starting and stopping

Browse Source 
In the application output, like we do when running elsewhere.

Change-Id: I842701162df20403e2b9757bc78bdd61176d581d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Eike Ziller
2024-02-01 14:47:55 +01:00
parent a7a06d6f79
commit acf7d30cbd
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/ios/iosrunner.cpp
View File

@@ -99,6 +99,7 @@ private:
GroupItem findProcess(Storage<AppInfo> &appInfo); GroupItem findProcess(Storage<AppInfo> &appInfo);
GroupItem killProcess(Storage<AppInfo> &appInfo); GroupItem killProcess(Storage<AppInfo> &appInfo);
GroupItem launchTask(const QString &bundleIdentifier); GroupItem launchTask(const QString &bundleIdentifier);
void reportStoppedImpl();
FilePath m_bundlePath; FilePath m_bundlePath;
QStringList m_arguments; QStringList m_arguments;
@@ -261,6 +262,13 @@ GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier)
return ProcessTask(onSetup, onDone); return ProcessTask(onSetup, onDone);
} }
void DeviceCtlRunner::reportStoppedImpl()
{
appendMessage(Tr::tr("\"%1\" exited").arg(m_bundlePath.toUserOutput()),
Utils::NormalMessageFormat);
reportStopped();
}
void DeviceCtlRunner::start() void DeviceCtlRunner::start()
{ {
QSettings settings(m_bundlePath.pathAppended("Info.plist").toString(), QSettings::NativeFormat); QSettings settings(m_bundlePath.pathAppended("Info.plist").toString(), QSettings::NativeFormat);
@@ -271,6 +279,10 @@ void DeviceCtlRunner::start()
return; return;
} }
appendMessage(Tr::tr("Running \"%1\" on %2...")
.arg(m_bundlePath.toUserOutput(), device()->displayName()),
NormalMessageFormat);
// If the app is already running, we should first kill it, then launch again. // If the app is already running, we should first kill it, then launch again.
// Usually deployment already kills the running app, but we support running without // Usually deployment already kills the running app, but we support running without
// deployment. Restarting is then e.g. needed if the app arguments changed. // deployment. Restarting is then e.g. needed if the app arguments changed.
@@ -298,7 +310,7 @@ void DeviceCtlRunner::stop()
m_pollTask.release()->deleteLater(); m_pollTask.release()->deleteLater();
const auto onSetup = [this](Process &process) { const auto onSetup = [this](Process &process) {
if (!m_device) { if (!m_device) {
reportStopped(); reportStoppedImpl();
return SetupResult::StopWithError; return SetupResult::StopWithError;
} }
process.setCommand({FilePath::fromString("/usr/bin/xcrun"), process.setCommand({FilePath::fromString("/usr/bin/xcrun"),
@@ -328,7 +340,7 @@ void DeviceCtlRunner::stop()
reportFailure(resultValue.error()); reportFailure(resultValue.error());
return DoneResult::Error; return DoneResult::Error;
} }
reportStopped(); reportStoppedImpl();
return DoneResult::Success; return DoneResult::Success;
}; };
m_runTask.reset(new TaskTree(Group{ProcessTask(onSetup, onDone)})); m_runTask.reset(new TaskTree(Group{ProcessTask(onSetup, onDone)}));
@@ -364,7 +376,7 @@ void DeviceCtlRunner::checkProcess()
// no process with processIdentifier found, or some error occurred, device disconnected // no process with processIdentifier found, or some error occurred, device disconnected
// or such, assume "stopped" // or such, assume "stopped"
m_pollTimer.stop(); m_pollTimer.stop();
reportStopped(); reportStoppedImpl();
} }
m_pollTask.release()->deleteLater(); m_pollTask.release()->deleteLater();
return DoneResult::Success; return DoneResult::Success;