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

MakeInstallStep: Employ task tree for running

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I1e4e971f980935425b5bb9dd0355a5ae09f3843e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-12 15:21:54 +02:00
parent c56301f4ff
commit 7d3cd76878
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -41,6 +41,7 @@ private:
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QWidget *createConfigWidget() override; QWidget *createConfigWidget() override;
bool init() override; bool init() override;
void doRun() override;
bool isJobCountSupported() const override { return false; } bool isJobCountSupported() const override { return false; }
void updateCommandFromAspect(); void updateCommandFromAspect();
@@ -131,35 +132,6 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent
if (format == OutputFormat::Stderr && string.contains("target 'install'")) if (format == OutputFormat::Stderr && string.contains("target 'install'"))
m_noInstallTarget = true; m_noInstallTarget = true;
}); });
setDoneHook([this](bool success) {
if (success) {
const FilePath rootDir = makeCommand().withNewPath(m_installRoot().path()); // FIXME: Needed?
m_deploymentData = DeploymentData();
m_deploymentData.setLocalInstallRoot(rootDir);
const int startPos = rootDir.path().length();
const auto appFileNames = transform<QSet<QString>>(buildSystem()->applicationTargets(),
[](const BuildTargetInfo &appTarget) { return appTarget.targetFilePath.fileName(); });
auto handleFile = [this, &appFileNames, startPos](const FilePath &filePath) {
const DeployableFile::Type type = appFileNames.contains(filePath.fileName())
? DeployableFile::TypeExecutable : DeployableFile::TypeNormal;
const QString targetDir = filePath.parentDir().path().mid(startPos);
m_deploymentData.addFile(filePath, targetDir, type);
return IterationPolicy::Continue;
};
rootDir.iterateDirectory(
handleFile, {{}, QDir::Files | QDir::Hidden, QDirIterator::Subdirectories});
buildSystem()->setDeploymentData(m_deploymentData);
} else if (m_noInstallTarget && m_isCmakeProject) {
emit addTask(DeploymentTask(Task::Warning, Tr::tr("You need to add an install statement "
"to your CMakeLists.txt file for deployment to work.")));
}
});
} }
QWidget *MakeInstallStep::createConfigWidget() QWidget *MakeInstallStep::createConfigWidget()
@@ -216,6 +188,43 @@ bool MakeInstallStep::init()
return true; return true;
} }
void MakeInstallStep::doRun()
{
using namespace Tasking;
const auto onDone = [this] {
const FilePath rootDir = makeCommand().withNewPath(m_installRoot().path()); // FIXME: Needed?
m_deploymentData = DeploymentData();
m_deploymentData.setLocalInstallRoot(rootDir);
const int startPos = rootDir.path().length();
const auto appFileNames = transform<QSet<QString>>(buildSystem()->applicationTargets(),
[](const BuildTargetInfo &appTarget) { return appTarget.targetFilePath.fileName(); });
auto handleFile = [this, &appFileNames, startPos](const FilePath &filePath) {
const DeployableFile::Type type = appFileNames.contains(filePath.fileName())
? DeployableFile::TypeExecutable : DeployableFile::TypeNormal;
const QString targetDir = filePath.parentDir().path().mid(startPos);
m_deploymentData.addFile(filePath, targetDir, type);
return IterationPolicy::Continue;
};
rootDir.iterateDirectory(
handleFile, {{}, QDir::Files | QDir::Hidden, QDirIterator::Subdirectories});
buildSystem()->setDeploymentData(m_deploymentData);
};
const auto onError = [this] {
if (m_noInstallTarget && m_isCmakeProject) {
emit addTask(DeploymentTask(Task::Warning, Tr::tr("You need to add an install "
"statement to your CMakeLists.txt file for deployment to work.")));
}
};
runTaskTree({onGroupDone(onDone), onGroupError(onError), defaultProcessTask()});
}
void MakeInstallStep::updateCommandFromAspect() void MakeInstallStep::updateCommandFromAspect()
{ {
if (m_customCommand.isChecked()) if (m_customCommand.isChecked())