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

Nim: Use new AbstractProcessStep convenience functions

Browse Source 
Change-Id: I48828392012e6a3a794473d4d32f0d2de2b52345
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-13 17:35:15 +02:00
parent 89e7e5ff7f
commit 6db2631ff3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/nim/project/nimblebuildstep.cpp
View File

@@ -104,6 +104,12 @@ NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Id id)
m_arguments->setSettingsKey(Constants::C_NIMBLEBUILDSTEP_ARGUMENTS); m_arguments->setSettingsKey(Constants::C_NIMBLEBUILDSTEP_ARGUMENTS);
m_arguments->setResetter([this] { return defaultArguments(); }); m_arguments->setResetter([this] { return defaultArguments(); });
setCommandLineProvider([this] {
return CommandLine(QStandardPaths::findExecutable("nimble"),
{"build", m_arguments->arguments(macroExpander())});
});
setWorkingDirectoryProvider([this] { return project()->projectDirectory(); });
QTC_ASSERT(buildConfiguration(), return); QTC_ASSERT(buildConfiguration(), return);
QObject::connect(buildConfiguration(), &BuildConfiguration::buildTypeChanged, QObject::connect(buildConfiguration(), &BuildConfiguration::buildTypeChanged,
m_arguments, &ArgumentsAspect::resetArguments); m_arguments, &ArgumentsAspect::resetArguments);
@@ -115,11 +121,8 @@ bool NimbleBuildStep::init()
{ {
m_arguments->setArguments(defaultArguments()); m_arguments->setArguments(defaultArguments());
ProcessParameters *params = processParameters(); ProcessParameters *params = processParameters();
params->setEnvironment(buildEnvironment()); setupProcessParameters(params);
params->setMacroExpander(macroExpander());
params->setWorkingDirectory(project()->projectDirectory());
params->setCommandLine({QStandardPaths::findExecutable("nimble"),
{"build", m_arguments->arguments(macroExpander())}});
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }