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

AutoTools: Use new AbstractProcessStep convenience functions

Browse Source 
Change-Id: I994343d3d5cccf7ced6f2e576bd1c1cd5055fc47
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-13 16:48:25 +02:00
parent 69ff17aa2d
commit 1d6779f185
3 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -85,15 +85,15 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep
m_runAutogen = true; m_runAutogen = true;
}); });
setCommandLineProvider([this] {
return CommandLine(FilePath::fromString("./autogen.sh"),
m_additionalArgumentsAspect->value(),
CommandLine::Raw);
});
setSummaryUpdater([this] { setSummaryUpdater([this] {
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(macroExpander()); setupProcessParameters(&param);
param.setEnvironment(buildEnvironment());
param.setWorkingDirectory(project()->projectDirectory());
param.setCommandLine({FilePath::fromString("./autogen.sh"),
m_additionalArgumentsAspect->value(),
CommandLine::Raw});
return param.summary(displayName()); return param.summary(displayName());
}); });
} }
@@ -101,13 +101,7 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep
bool AutogenStep::init() bool AutogenStep::init()
{ {
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(macroExpander()); setupProcessParameters(pp);
pp->setEnvironment(buildEnvironment());
pp->setWorkingDirectory(project()->projectDirectory());
pp->setCommandLine({FilePath::fromString("./autogen.sh"),
m_additionalArgumentsAspect->value(),
CommandLine::Raw});
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }

23
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -83,15 +83,17 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
m_runAutoreconf = true; m_runAutoreconf = true;
}); });
setCommandLineProvider([this] {
return Utils::CommandLine(Utils::FilePath::fromString("autoreconf"),
m_additionalArgumentsAspect->value(),
Utils::CommandLine::Raw);
});
setWorkingDirectoryProvider([this] { return project()->projectDirectory(); });
setSummaryUpdater([this] { setSummaryUpdater([this] {
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(macroExpander()); setupProcessParameters(&param);
param.setEnvironment(buildEnvironment());
param.setWorkingDirectory(project()->projectDirectory());
param.setCommandLine({Utils::FilePath::fromString("autoreconf"),
m_additionalArgumentsAspect->value(),
Utils::CommandLine::Raw});
return param.summary(displayName()); return param.summary(displayName());
}); });
} }
@@ -99,12 +101,7 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
bool AutoreconfStep::init() bool AutoreconfStep::init()
{ {
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(macroExpander()); setupProcessParameters(pp);
pp->setEnvironment(buildEnvironment());
pp->setWorkingDirectory(project()->projectDirectory());
pp->setCommandLine({Utils::FilePath::fromString("autoreconf"),
m_additionalArgumentsAspect->value(), Utils::CommandLine::Raw});
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }

24
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -105,16 +105,19 @@ ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
m_runConfigure = true; m_runConfigure = true;
}); });
setSummaryUpdater([this] { setWorkingDirectoryProvider([this] { return project()->projectDirectory(); });
setCommandLineProvider([this] {
BuildConfiguration *bc = buildConfiguration(); BuildConfiguration *bc = buildConfiguration();
ProcessParameters param; return CommandLine({FilePath::fromString(projectDirRelativeToBuildDir(bc) + "configure"),
param.setMacroExpander(macroExpander());
param.setEnvironment(buildEnvironment());
param.setWorkingDirectory(buildDirectory());
param.setCommandLine({FilePath::fromString(projectDirRelativeToBuildDir(bc) + "configure"),
m_additionalArgumentsAspect->value(), m_additionalArgumentsAspect->value(),
CommandLine::Raw}); CommandLine::Raw});
});
setSummaryUpdater([this] {
ProcessParameters param;
setupProcessParameters(&param);
return param.summaryInWorkdir(displayName()); return param.summaryInWorkdir(displayName());
}); });
@@ -122,15 +125,8 @@ ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
bool ConfigureStep::init() bool ConfigureStep::init()
{ {
BuildConfiguration *bc = buildConfiguration();
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(macroExpander()); setupProcessParameters(pp);
pp->setEnvironment(buildEnvironment());
pp->setWorkingDirectory(buildDirectory());
pp->setCommandLine({FilePath::fromString(projectDirRelativeToBuildDir(bc) + "configure"),
m_additionalArgumentsAspect->value(),
CommandLine::Raw});
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }