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

Ios: Use new AbstractProcessStep convenience functions

Browse Source 
Change-Id: I8a20690b679a4f2205295be48e4e5e99dee94d79
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-08-13 17:34:54 +02:00
parent e1d0b4cf48
commit 0cfe11a960
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/ios/iosbuildstep.cpp
View File

@@ -171,11 +171,7 @@ private:
void updateDetails() void updateDetails()
{ {
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(m_buildStep->macroExpander()); m_buildStep->setupProcessParameters(&param);
param.setWorkingDirectory(m_buildStep->buildDirectory());
param.setEnvironment(m_buildStep->buildEnvironment());
param.setCommandLine({m_buildStep->buildCommand(), m_buildStep->allArguments()});
setSummaryText(param.summary(displayName())); setSummaryText(param.summary(displayName()));
} }
@@ -191,6 +187,9 @@ IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
{ {
setDefaultDisplayName(tr("xcodebuild")); setDefaultDisplayName(tr("xcodebuild"));
setCommandLineProvider([this] { return CommandLine(buildCommand(), allArguments()); });
setUseEnglishOutput();
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
m_clean = true; m_clean = true;
setExtraArguments(QStringList("clean")); setExtraArguments(QStringList("clean"));
@@ -211,11 +210,7 @@ bool IosBuildStep::init()
} }
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander()); setupProcessParameters(pp);
pp->setWorkingDirectory(bc->buildDirectory());
Utils::Environment env = bc->environment();
Utils::Environment::setupEnglishOutput(&env);
pp->setEnvironment(env);
pp->setCommandLine({buildCommand(), allArguments()}); pp->setCommandLine({buildCommand(), allArguments()});
// If we are cleaning, then build can fail with an error code, but that doesn't mean // If we are cleaning, then build can fail with an error code, but that doesn't mean

15
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -63,17 +63,14 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
AbstractProcessStep(parent, id), AbstractProcessStep(parent, id),
m_clean(parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) m_clean(parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
{ {
setCommandLineProvider([this] { return CommandLine(command(), arguments()); });
setUseEnglishOutput();
} }
bool IosDsymBuildStep::init() bool IosDsymBuildStep::init()
{ {
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(macroExpander()); setupProcessParameters(pp);
pp->setWorkingDirectory(buildDirectory());
Utils::Environment env = buildEnvironment();
Utils::Environment::setupEnglishOutput(&env);
pp->setEnvironment(env);
pp->setCommandLine({command(), arguments()});
// If we are cleaning, then build can fail with an error code, but that doesn't mean // If we are cleaning, then build can fail with an error code, but that doesn't mean
// we should stop the clean queue // we should stop the clean queue
@@ -257,11 +254,7 @@ IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget()
void IosDsymBuildStepConfigWidget::updateDetails() void IosDsymBuildStepConfigWidget::updateDetails()
{ {
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(m_buildStep->macroExpander()); m_buildStep->setupProcessParameters(&param);
param.setWorkingDirectory(m_buildStep->buildDirectory());
param.setEnvironment(m_buildStep->buildEnvironment());
param.setCommandLine({m_buildStep->command(), m_buildStep->arguments()});
setSummaryText(param.summary(displayName())); setSummaryText(param.summary(displayName()));
} }