forked from qt-creator/qt-creator
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6 did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
@@ -31,17 +31,17 @@ namespace Ios {
|
||||
namespace Internal {
|
||||
namespace Ui { class IosPresetBuildStep; }
|
||||
|
||||
class IosPresetBuildStepConfigWidget;
|
||||
class IosPresetBuildStepFactory;
|
||||
class IosDsymBuildStepConfigWidget;
|
||||
|
||||
class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
|
||||
class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
friend class IosPresetBuildStepConfigWidget;
|
||||
friend class IosPresetBuildStepFactory;
|
||||
friend class IosDsymBuildStepConfigWidget;
|
||||
|
||||
public:
|
||||
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
|
||||
@@ -53,31 +53,27 @@ public:
|
||||
QString defaultCommand() const;
|
||||
QString command() const;
|
||||
void setCommand(const QString &command);
|
||||
bool clean() const;
|
||||
void setClean(bool clean);
|
||||
bool isDefault() const;
|
||||
|
||||
QVariantMap toMap() const override;
|
||||
protected:
|
||||
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
|
||||
virtual bool completeSetup();
|
||||
virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
virtual QStringList defaultCleanCmdList() const = 0;
|
||||
virtual QStringList defaultCmdList() const = 0;
|
||||
|
||||
private:
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
QStringList defaultCleanCmdList() const;
|
||||
QStringList defaultCmdList() const;
|
||||
|
||||
QStringList m_arguments;
|
||||
QString m_command;
|
||||
bool m_clean;
|
||||
};
|
||||
|
||||
class IosPresetBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
||||
class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
IosPresetBuildStepConfigWidget(IosPresetBuildStep *buildStep);
|
||||
~IosPresetBuildStepConfigWidget();
|
||||
IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
|
||||
~IosDsymBuildStepConfigWidget();
|
||||
QString displayName() const override;
|
||||
QString summaryText() const override;
|
||||
|
||||
@@ -88,47 +84,15 @@ private:
|
||||
void updateDetails();
|
||||
|
||||
Ui::IosPresetBuildStep *m_ui;
|
||||
IosPresetBuildStep *m_buildStep;
|
||||
IosDsymBuildStep *m_buildStep;
|
||||
QString m_summaryText;
|
||||
};
|
||||
|
||||
class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit IosPresetBuildStepFactory(QObject *parent = 0);
|
||||
|
||||
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override;
|
||||
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
|
||||
ProjectExplorer::BuildStep *source) override;
|
||||
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
|
||||
const QVariantMap &map) override;
|
||||
|
||||
protected:
|
||||
virtual IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
|
||||
const Core::Id id) const = 0;
|
||||
};
|
||||
|
||||
class IosDsymBuildStep : public IosPresetBuildStep
|
||||
{
|
||||
Q_OBJECT
|
||||
friend class IosDsymBuildStepFactory;
|
||||
protected:
|
||||
QStringList defaultCleanCmdList() const override;
|
||||
QStringList defaultCmdList() const override;
|
||||
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
|
||||
};
|
||||
|
||||
class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
|
||||
class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QList<ProjectExplorer::BuildStepInfo>
|
||||
availableSteps(ProjectExplorer::BuildStepList *parent) const override;
|
||||
|
||||
IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
|
||||
const Core::Id id) const override;
|
||||
explicit IosDsymBuildStepFactory();
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user