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

AutoTools: Use direct aspect registration in AutoreconfStep

Browse Source 
Task-number: QTCREATORBUG-29168
Change-Id: I886e84a752031cabb8bf235dc4e83c8f78ae88cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-06-29 18:00:06 +02:00
parent 941c99c893
commit e53bc1630a
1 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@
#include <projectexplorer/processparameters.h> #include <projectexplorer/processparameters.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <utils/aspects.h> #include <utils/aspects.h>
@@ -34,58 +33,55 @@ namespace AutotoolsProjectManager::Internal {
class AutoreconfStep final : public AbstractProcessStep class AutoreconfStep final : public AbstractProcessStep
{ {
public: public:
AutoreconfStep(BuildStepList *bsl, Id id); AutoreconfStep(BuildStepList *bsl, Id id)
: AbstractProcessStep(bsl, id)
{
arguments.setSettingsKey("AutotoolsProjectManager.AutoreconfStep.AdditionalArguments");
arguments.setLabelText(Tr::tr("Arguments:"));
arguments.setValue("--force --install");
arguments.setDisplayStyle(StringAspect::LineEditDisplay);
arguments.setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
void doRun() override; connect(&arguments, &BaseAspect::changed, this, [this] { m_runAutoreconf = true; });
setCommandLineProvider([this] {
return CommandLine("autoreconf", arguments(), CommandLine::Raw);
});
setWorkingDirectoryProvider([this] {
return project()->projectDirectory();
});
setSummaryUpdater([this] {
ProcessParameters param;
setupProcessParameters(&param);
return param.summary(displayName());
});
}
void doRun() override
{
// Check whether we need to run autoreconf
const FilePath configure = project()->projectDirectory() / "configure";
if (!configure.exists())
m_runAutoreconf = true;
if (!m_runAutoreconf) {
emit addOutput(Tr::tr("Configuration unchanged, skipping autoreconf step."),
OutputFormat::NormalMessage);
emit finished(true);
return;
}
m_runAutoreconf = false;
AbstractProcessStep::doRun();
}
private: private:
bool m_runAutoreconf = false; bool m_runAutoreconf = false;
StringAspect arguments{this};
}; };
AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Id id)
: AbstractProcessStep(bsl, id)
{
auto arguments = addAspect<StringAspect>();
arguments->setSettingsKey("AutotoolsProjectManager.AutoreconfStep.AdditionalArguments");
arguments->setLabelText(Tr::tr("Arguments:"));
arguments->setValue("--force --install");
arguments->setDisplayStyle(StringAspect::LineEditDisplay);
arguments->setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
connect(arguments, &BaseAspect::changed, this, [this] {
m_runAutoreconf = true;
});
setCommandLineProvider([arguments] {
return CommandLine("autoreconf", arguments->value(), CommandLine::Raw);
});
setWorkingDirectoryProvider([this] { return project()->projectDirectory(); });
setSummaryUpdater([this] {
ProcessParameters param;
setupProcessParameters(&param);
return param.summary(displayName());
});
}
void AutoreconfStep::doRun()
{
// Check whether we need to run autoreconf
const FilePath configure = project()->projectDirectory() / "configure";
if (!configure.exists())
m_runAutoreconf = true;
if (!m_runAutoreconf) {
emit addOutput(Tr::tr("Configuration unchanged, skipping autoreconf step."),
OutputFormat::NormalMessage);
emit finished(true);
return;
}
m_runAutoreconf = false;
AbstractProcessStep::doRun();
}
// AutoreconfStepFactory // AutoreconfStepFactory