forked from qt-creator/qt-creator
ProjectExplorer: Simplify BuildStep::init() signature
The extra parameter was always computed but used only in one place, and that use got removed lately. Change-Id: Ie10c0107ca70ee97ce03f83294992aab8d1a3ffe Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -133,7 +133,7 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
|
||||
setImmutable(true);
|
||||
}
|
||||
|
||||
bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AndroidBuildApkStep::init()
|
||||
{
|
||||
ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -193,7 +193,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
m_apkPath = AndroidManager::apkPath(target()).toString();
|
||||
qCDebug(buildapkstepLog) << "APK path:" << m_apkPath;
|
||||
|
||||
if (!AbstractProcessStep::init(earlierSteps))
|
||||
if (!AbstractProcessStep::init())
|
||||
return false;
|
||||
|
||||
QString command = version->qmakeProperty("QT_HOST_BINS");
|
||||
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
private:
|
||||
Q_INVOKABLE void showInGraphicalShell();
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
void processStarted() override;
|
||||
void processFinished(int exitCode, QProcess::ExitStatus status) override;
|
||||
|
||||
@@ -106,9 +106,8 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
|
||||
this, &AndroidDeployQtStep::slotSetSerialNumber);
|
||||
}
|
||||
|
||||
bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AndroidDeployQtStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
m_androiddeployqtArgs.clear();
|
||||
|
||||
m_targetArch = AndroidManager::targetArch(target());
|
||||
|
||||
@@ -86,7 +86,7 @@ signals:
|
||||
private:
|
||||
void runCommand(const QString &program, const QStringList &arguments);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
void gatherFilesToPull();
|
||||
DeployErrorCode runDeploy(QFutureInterface<bool> &fi);
|
||||
|
||||
@@ -58,7 +58,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
|
||||
setImmutable(true);
|
||||
}
|
||||
|
||||
bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AndroidPackageInstallationStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
QString dirPath = bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString();
|
||||
@@ -92,7 +92,7 @@ bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps
|
||||
m_androidDirsToClean << dirPath + "/assets";
|
||||
m_androidDirsToClean << dirPath + "/libs";
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void AndroidPackageInstallationStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -40,7 +40,7 @@ class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::Ab
|
||||
|
||||
public:
|
||||
explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl);
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ AutogenStep::AutogenStep(BuildStepList *bsl) : AbstractProcessStep(bsl, AUTOGEN_
|
||||
m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutogenStepArgs");
|
||||
}
|
||||
|
||||
bool AutogenStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AutogenStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -83,7 +83,7 @@ bool AutogenStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
pp->setArguments(m_additionalArgumentsAspect->value());
|
||||
pp->resolveAll();
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void AutogenStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -66,7 +66,7 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
explicit AutogenStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl) : AbstractProcessStep(bsl, AU
|
||||
m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
|
||||
}
|
||||
|
||||
bool AutoreconfStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AutoreconfStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -81,7 +81,7 @@ bool AutoreconfStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
pp->setArguments(m_additionalArgumentsAspect->value());
|
||||
pp->resolveAll();
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void AutoreconfStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -66,7 +66,7 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ ConfigureStep::ConfigureStep(BuildStepList *bsl) : AbstractProcessStep(bsl, CONF
|
||||
m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.ConfigureArgs");
|
||||
}
|
||||
|
||||
bool ConfigureStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool ConfigureStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -102,7 +102,7 @@ bool ConfigureStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
pp->setArguments(m_additionalArgumentsAspect->value());
|
||||
pp->resolveAll();
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void ConfigureStep::run(QFutureInterface<bool>& fi)
|
||||
|
||||
@@ -67,7 +67,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
|
||||
@@ -114,9 +114,8 @@ QString BareMetalGdbCommandsDeployStep::gdbCommands() const
|
||||
return m_gdbCommands;
|
||||
}
|
||||
|
||||
bool BareMetalGdbCommandsDeployStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool BareMetalGdbCommandsDeployStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class BareMetalGdbCommandsDeployStep : public ProjectExplorer::BuildStep
|
||||
public:
|
||||
explicit BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
|
||||
@@ -146,7 +146,7 @@ bool CMakeBuildStep::fromMap(const QVariantMap &map)
|
||||
}
|
||||
|
||||
|
||||
bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool CMakeBuildStep::init()
|
||||
{
|
||||
bool canInit = true;
|
||||
CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
|
||||
@@ -228,7 +228,7 @@ bool CMakeBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
appendOutputParser(parser);
|
||||
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void CMakeBuildStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
|
||||
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -70,7 +70,7 @@ IosBuildStep::IosBuildStep(BuildStepList *parent) :
|
||||
}
|
||||
}
|
||||
|
||||
bool IosBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool IosBuildStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
if (!bc)
|
||||
@@ -106,7 +106,7 @@ bool IosBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
appendOutputParser(parser);
|
||||
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
QVariantMap IosBuildStep::toMap() const
|
||||
|
||||
@@ -48,7 +48,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -77,9 +77,8 @@ void IosDeployStep::updateDisplayNames()
|
||||
setDisplayName(tr("Deploy to %1").arg(devName));
|
||||
}
|
||||
|
||||
bool IosDeployStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool IosDeployStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
QTC_ASSERT(m_transferStatus == NoTransfer, return false);
|
||||
m_device = DeviceKitInformation::device(target()->kit());
|
||||
auto runConfig = qobject_cast<const IosRunConfiguration *>(
|
||||
|
||||
@@ -70,7 +70,7 @@ private:
|
||||
void handleErrorMsg(Ios::IosToolHandler *handler, const QString &msg);
|
||||
void updateDisplayNames();
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
ProjectExplorer::IDevice::ConstPtr device() const;
|
||||
IosDevice::ConstPtr iosdevice() const;
|
||||
|
||||
@@ -62,7 +62,7 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent) :
|
||||
{
|
||||
}
|
||||
|
||||
bool IosDsymBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool IosDsymBuildStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -85,7 +85,7 @@ bool IosDsymBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
if (outputParser())
|
||||
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
QVariantMap IosDsymBuildStep::toMap() const
|
||||
|
||||
@@ -42,7 +42,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -116,13 +116,13 @@ NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList)
|
||||
updateProcessParameters();
|
||||
}
|
||||
|
||||
bool NimCompilerBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool NimCompilerBuildStep::init()
|
||||
{
|
||||
setOutputParser(new NimParser());
|
||||
if (IOutputParser *parser = target()->kit()->createOutputParser())
|
||||
appendOutputParser(parser);
|
||||
outputParser()->setWorkingDirectory(processParameters()->effectiveWorkingDirectory());
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *NimCompilerBuildStep::createConfigWidget()
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
|
||||
NimCompilerBuildStep(ProjectExplorer::BuildStepList *parentList);
|
||||
|
||||
bool init(QList<const ProjectExplorer::BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
|
||||
@@ -52,7 +52,7 @@ BuildStepConfigWidget *NimCompilerCleanStep::createConfigWidget()
|
||||
return new NimCompilerCleanStepConfigWidget(this);
|
||||
}
|
||||
|
||||
bool NimCompilerCleanStep::init(QList<const BuildStep *> &)
|
||||
bool NimCompilerCleanStep::init()
|
||||
{
|
||||
FileName buildDir = buildConfiguration()->buildDirectory();
|
||||
bool result = buildDir.exists();
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
NimCompilerCleanStep(ProjectExplorer::BuildStepList *parentList);
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -197,10 +197,8 @@ void AbstractProcessStep::setIgnoreReturnValue(bool b)
|
||||
YourBuildStep::init().
|
||||
*/
|
||||
|
||||
bool AbstractProcessStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AbstractProcessStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
|
||||
d->m_candidates.clear();
|
||||
const Utils::FileNameList fl = project()->files(Project::AllFiles);
|
||||
for (const Utils::FileName &file : fl)
|
||||
|
||||
@@ -41,7 +41,7 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &) override;
|
||||
|
||||
ProcessParameters *processParameters();
|
||||
|
||||
@@ -476,7 +476,6 @@ bool BuildManager::buildQueueAppend(const QList<BuildStep *> &steps, QStringList
|
||||
addToOutputWindow(str, BuildStep::OutputFormat::NormalMessage, BuildStep::DontAppendNewline);
|
||||
}
|
||||
|
||||
QList<const BuildStep *> earlierSteps;
|
||||
int count = steps.size();
|
||||
bool init = true;
|
||||
int i = 0;
|
||||
@@ -485,10 +484,9 @@ bool BuildManager::buildQueueAppend(const QList<BuildStep *> &steps, QStringList
|
||||
connect(bs, &BuildStep::addTask, m_instance, &BuildManager::addToTaskWindow);
|
||||
connect(bs, &BuildStep::addOutput, m_instance, &BuildManager::addToOutputWindow);
|
||||
if (bs->enabled()) {
|
||||
init = bs->init(earlierSteps);
|
||||
init = bs->init();
|
||||
if (!init)
|
||||
break;
|
||||
earlierSteps.append(bs);
|
||||
}
|
||||
}
|
||||
if (!init) {
|
||||
|
||||
@@ -53,7 +53,7 @@ protected:
|
||||
explicit BuildStep(BuildStepList *bsl, Core::Id id);
|
||||
|
||||
public:
|
||||
virtual bool init(QList<const BuildStep *> &earlierSteps) = 0;
|
||||
virtual bool init() = 0;
|
||||
virtual void run(QFutureInterface<bool> &fi) = 0;
|
||||
virtual BuildStepConfigWidget *createConfigWidget();
|
||||
|
||||
|
||||
@@ -42,9 +42,8 @@ DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl)
|
||||
setWidgetExpandedByDefault(false);
|
||||
}
|
||||
|
||||
bool DeviceCheckBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool DeviceCheckBuildStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
IDevice::ConstPtr device = DeviceKitInformation::device(target()->kit());
|
||||
if (!device) {
|
||||
Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(target()->kit());
|
||||
|
||||
@@ -38,8 +38,7 @@ class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
|
||||
public:
|
||||
explicit DeviceCheckBuildStep(BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
static Core::Id stepId();
|
||||
|
||||
@@ -72,7 +72,7 @@ MakeStep::MakeStep(BuildStepList *parent,
|
||||
setBuildTarget(buildTarget, true);
|
||||
}
|
||||
|
||||
bool MakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool MakeStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
if (!bc)
|
||||
@@ -106,7 +106,7 @@ bool MakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
appendOutputParser(parser);
|
||||
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void MakeStep::setClean(bool clean)
|
||||
|
||||
@@ -48,7 +48,7 @@ public:
|
||||
const QString &buildTarget = QString(),
|
||||
const QStringList &availableTargets = {});
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
bool buildsTarget(const QString &target) const;
|
||||
void setBuildTarget(const QString &target, bool on);
|
||||
|
||||
@@ -56,7 +56,7 @@ ProcessStep::ProcessStep(BuildStepList *bsl)
|
||||
m_workingDirectory = Constants::DEFAULT_WORKING_DIR;
|
||||
}
|
||||
|
||||
bool ProcessStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool ProcessStep::init()
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
ProcessParameters *pp = processParameters();
|
||||
@@ -68,7 +68,7 @@ bool ProcessStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
pp->resolveAll();
|
||||
|
||||
setOutputParser(target()->kit()->createOutputParser());
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void ProcessStep::run(QFutureInterface<bool> & fi)
|
||||
|
||||
@@ -45,7 +45,7 @@ class ProcessStep : public AbstractProcessStep
|
||||
public:
|
||||
explicit ProcessStep(BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &) override;
|
||||
|
||||
BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -142,9 +142,8 @@ QbsBuildStep::~QbsBuildStep()
|
||||
delete m_parser;
|
||||
}
|
||||
|
||||
bool QbsBuildStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool QbsBuildStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
if (project()->isParsing() || m_job)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -58,8 +58,7 @@ public:
|
||||
explicit QbsBuildStep(ProjectExplorer::BuildStepList *bsl);
|
||||
~QbsBuildStep() override;
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -64,9 +64,8 @@ QbsCleanStep::~QbsCleanStep()
|
||||
}
|
||||
}
|
||||
|
||||
bool QbsCleanStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool QbsCleanStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
if (project()->isParsing() || m_job)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -45,8 +45,7 @@ public:
|
||||
explicit QbsCleanStep(ProjectExplorer::BuildStepList *bsl);
|
||||
~QbsCleanStep() override;
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -80,9 +80,8 @@ QbsInstallStep::~QbsInstallStep()
|
||||
m_job = nullptr;
|
||||
}
|
||||
|
||||
bool QbsInstallStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool QbsInstallStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
QTC_ASSERT(!project()->isParsing() && !m_job, return false);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -45,8 +45,7 @@ public:
|
||||
explicit QbsInstallStep(ProjectExplorer::BuildStepList *bsl);
|
||||
~QbsInstallStep() override;
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
@@ -66,7 +66,7 @@ QmakeBuildConfiguration *QmakeMakeStep::qmakeBuildConfiguration() const
|
||||
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
||||
}
|
||||
|
||||
bool QmakeMakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool QmakeMakeStep::init()
|
||||
{
|
||||
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
|
||||
if (!bc)
|
||||
@@ -169,7 +169,7 @@ bool QmakeMakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
|
||||
m_scriptTarget = (static_cast<QmakeProject *>(bc->target()->project())->rootProjectNode()->projectType() == ProjectType::ScriptTemplate);
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void QmakeMakeStep::run(QFutureInterface<bool> & fi)
|
||||
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
|
||||
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &) override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -164,8 +164,7 @@ QMakeStepConfig QMakeStep::deducedArguments() const
|
||||
return config;
|
||||
}
|
||||
|
||||
|
||||
bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool QMakeStep::init()
|
||||
{
|
||||
if (m_commandFuture)
|
||||
return false;
|
||||
@@ -254,7 +253,7 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
|
||||
m_scriptTemplate = node->projectType() == ProjectType::ScriptTemplate;
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void QMakeStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
|
||||
|
||||
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
void setForced(bool b);
|
||||
|
||||
@@ -123,9 +123,8 @@ bool AbstractPackagingStep::isPackagingNeeded() const
|
||||
return false;
|
||||
}
|
||||
|
||||
bool AbstractPackagingStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AbstractPackagingStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
d->cachedPackageDirectory = packageDirectory();
|
||||
d->cachedPackageFilePath = packageFilePath();
|
||||
return true;
|
||||
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
|
||||
QString packageFilePath() const;
|
||||
QString cachedPackageFilePath() const;
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
|
||||
signals:
|
||||
void packageFilePathChanged();
|
||||
|
||||
@@ -69,9 +69,8 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
|
||||
return BuildStep::toMap().unite(deployService()->exportDeployTimes());
|
||||
}
|
||||
|
||||
bool AbstractRemoteLinuxDeployStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool AbstractRemoteLinuxDeployStep::init()
|
||||
{
|
||||
Q_UNUSED(earlierSteps);
|
||||
QString error;
|
||||
deployService()->setTarget(target());
|
||||
const bool canDeploy = initInternal(&error);
|
||||
|
||||
@@ -45,7 +45,7 @@ public:
|
||||
~AbstractRemoteLinuxDeployStep() override;
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
QVariantMap toMap() const override;
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
void cancel() override;
|
||||
RemoteLinuxDeployConfiguration *deployConfiguration() const;
|
||||
|
||||
@@ -84,9 +84,9 @@ TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl)
|
||||
m_incrementalDeploymentAspect->setSettingsKey(IncrementalDeploymentKey);
|
||||
}
|
||||
|
||||
bool TarPackageCreationStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool TarPackageCreationStep::init()
|
||||
{
|
||||
if (!AbstractPackagingStep::init(earlierSteps))
|
||||
if (!AbstractPackagingStep::init())
|
||||
return false;
|
||||
|
||||
m_packagingNeeded = isPackagingNeeded();
|
||||
|
||||
@@ -48,7 +48,7 @@ public:
|
||||
static Core::Id stepId();
|
||||
static QString displayName();
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
void setIgnoreMissingFiles(bool ignoreMissingFiles);
|
||||
|
||||
@@ -64,7 +64,7 @@ WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl)
|
||||
m_argsAspect->setLabelText(tr("Arguments:"));
|
||||
}
|
||||
|
||||
bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
bool WinRtPackageDeploymentStep::init()
|
||||
{
|
||||
RunConfiguration *rc = target()->activeRunConfiguration();
|
||||
QTC_ASSERT(rc, return false);
|
||||
@@ -111,7 +111,7 @@ bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
params->setArguments(args);
|
||||
params->setEnvironment(buildConfiguration()->environment());
|
||||
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
return AbstractProcessStep::init();
|
||||
}
|
||||
|
||||
void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi)
|
||||
|
||||
@@ -38,7 +38,7 @@ class WinRtPackageDeploymentStep : public ProjectExplorer::AbstractProcessStep
|
||||
public:
|
||||
explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
bool init() override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
bool processSucceeded(int exitCode, QProcess::ExitStatus status) override;
|
||||
void stdOutput(const QString &line) override;
|
||||
|
||||
Reference in New Issue
Block a user