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

BuildManager: Provide context of earlier build steps to init

Browse Source 
This information can be used to get information from earlier steps,
which e.g. queried for android devices to deploy to.

Change-Id: Iefe1c9443915cb6211f86f98ff7aaf3cb75145ba
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-13 12:19:35 +01:00
parent cedf015c10
commit 79f82d0d0a
54 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ void IosBuildStep::ctor()
IOS_BUILD_STEP_DISPLAY_NAME));
}
bool IosBuildStep::init()
bool IosBuildStep::init(QList<const BuildStep *> &earlierSteps)
{
BuildConfiguration *bc = buildConfiguration();
if (!bc)
@@ -135,7 +135,7 @@ bool IosBuildStep::init()
appendOutputParser(parser);
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
return AbstractProcessStep::init();
return AbstractProcessStep::init(earlierSteps);
}
void IosBuildStep::setClean(bool clean)

2
src/plugins/ios/iosbuildstep.h
View File

@@ -53,7 +53,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
public:
explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
bool init() override;
bool init(QList<const BuildStep *> &earlierSteps) override;
void run(QFutureInterface<bool> &fi) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;

3
src/plugins/ios/iosdeploystep.cpp
View File

@@ -97,8 +97,9 @@ void IosDeployStep::updateDisplayNames()
setDisplayName(tr("Deploy to %1").arg(devName));
}
bool IosDeployStep::init()
bool IosDeployStep::init(QList<const BuildStep *> &earlierSteps)
{
Q_UNUSED(earlierSteps);
QTC_ASSERT(m_transferStatus == NoTransfer, return false);
m_device = DeviceKitInformation::device(target()->kit());
IosRunConfiguration * runConfig = qobject_cast<IosRunConfiguration *>(

2
src/plugins/ios/iosdeploystep.h
View File

@@ -88,7 +88,7 @@ private slots:
private:
IosDeployStep(ProjectExplorer::BuildStepList *bc,
IosDeployStep *other);
bool init() override;
bool init(QList<const BuildStep *> &earlierSteps) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const override { return true; }
bool runInGuiThread() const override { return true; }

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

@@ -84,7 +84,7 @@ bool IosPresetBuildStep::completeSetupWithStep(BuildStep *bs)
return true;
}
bool IosPresetBuildStep::init()
bool IosPresetBuildStep::init(QList<const BuildStep *> &earlierSteps)
{
BuildConfiguration *bc = buildConfiguration();
if (!bc)
@@ -111,7 +111,7 @@ bool IosPresetBuildStep::init()
if (outputParser())
outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory());
return AbstractProcessStep::init();
return AbstractProcessStep::init(earlierSteps);
}
QVariantMap IosPresetBuildStep::toMap() const

2
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -47,7 +47,7 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
friend class IosPresetBuildStepFactory;
public:
bool init() override;
bool init(QList<const BuildStep *> &earlierSteps) override;
void run(QFutureInterface<bool> &fi) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;