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

AppMan: Improve RunControl handling

Browse Source 
* Native Runtime apps are now supported properly
* Support using a vanilla appman-controller by NOT closing the write
  channel.

Change-Id: If2d4367595f12f0e46a8dbcda4a26d5dc03be324
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Dominik Holland
2024-01-11 13:10:31 +01:00
parent fe6dd92f99
commit 23da92e60b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
View File

@@ -54,6 +54,8 @@ public:
if (!targetInformation.isValid()) if (!targetInformation.isValid())
return; return;
// Prevent the write channel to be closed, otherwise the appman-controller will exit
setProcessMode(ProcessMode::Writer);
setWorkingDirectory(targetInformation.workingDirectory()); setWorkingDirectory(targetInformation.workingDirectory());
setCommandLine({FilePath::fromString(getToolFilePath(Constants::APPMAN_CONTROLLER, runControl->kit(), setCommandLine({FilePath::fromString(getToolFilePath(Constants::APPMAN_CONTROLLER, runControl->kit(),
targetInformation.device)), targetInformation.device)),
@@ -102,6 +104,8 @@ public:
cmd.addArg("-eio"); cmd.addArg("-eio");
cmd.addArg(targetInformation.manifest.id); cmd.addArg(targetInformation.manifest.id);
// Prevent the write channel to be closed, otherwise the appman-controller will exit
setProcessMode(ProcessMode::Writer);
setCommandLine(cmd); setCommandLine(cmd);
setWorkingDirectory(targetInformation.workingDirectory()); setWorkingDirectory(targetInformation.workingDirectory());
@@ -139,7 +143,7 @@ public:
const Utils::FilePath dir = SysRootKitAspect::sysRoot(target->kit()); const Utils::FilePath dir = SysRootKitAspect::sysRoot(target->kit());
// TODO: get real aspect from deploy configuration // TODO: get real aspect from deploy configuration
QString amfolder = Constants::REMOTE_DEFAULT_BIN_PATH; QString amfolder = Constants::REMOTE_DEFAULT_BIN_PATH;
m_symbolFile = dir.toString() + amfolder + Constants::APPMAN_LAUNCHER_QML; m_symbolFile = dir.toString() + amfolder + QDir::separator() + Constants::APPMAN_LAUNCHER_QML;
} else if (targetInformation.manifest.isNativeRuntime()) { } else if (targetInformation.manifest.isNativeRuntime()) {
m_symbolFile = Utils::findOrDefault(target->buildSystem()->applicationTargets(), [&](const BuildTargetInfo &ti) { m_symbolFile = Utils::findOrDefault(target->buildSystem()->applicationTargets(), [&](const BuildTargetInfo &ti) {
return ti.buildKey == targetInformation.manifest.code || ti.projectFilePath.toString() == targetInformation.manifest.code; return ti.buildKey == targetInformation.manifest.code || ti.projectFilePath.toString() == targetInformation.manifest.code;

2
src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp
View File

@@ -53,6 +53,7 @@ QList<TargetInformation> TargetInformation::readFromProject(const Target *target
auto createTargetInformation = [buildKey, manifestFilePath, cmakeTarget, packageFilePath, isBuiltinPackage, &result](const YAML::Node &document) { auto createTargetInformation = [buildKey, manifestFilePath, cmakeTarget, packageFilePath, isBuiltinPackage, &result](const YAML::Node &document) {
const QString id = QString::fromStdString(document["id"].as<std::string>()); const QString id = QString::fromStdString(document["id"].as<std::string>());
const QString runtime = QString::fromStdString(document["runtime"].as<std::string>()); const QString runtime = QString::fromStdString(document["runtime"].as<std::string>());
const QString code = QString::fromStdString(document["code"].as<std::string>());
if (!buildKey.isEmpty() && buildKey != id) if (!buildKey.isEmpty() && buildKey != id)
return; return;
@@ -64,6 +65,7 @@ QList<TargetInformation> TargetInformation::readFromProject(const Target *target
ati.manifest.fileName = manifestFilePath.path(); ati.manifest.fileName = manifestFilePath.path();
ati.manifest.id = id; ati.manifest.id = id;
ati.manifest.runtime = runtime; ati.manifest.runtime = runtime;
ati.manifest.code = code;
ati.isBuiltin = isBuiltinPackage; ati.isBuiltin = isBuiltinPackage;
ati.cmakeBuildTarget = cmakeTarget; ati.cmakeBuildTarget = cmakeTarget;
ati.packageFile = QFileInfo(packageFilePath.path()); ati.packageFile = QFileInfo(packageFilePath.path());