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
  890c1906e6fb2ec 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>

1 files changed, 49 insertions, 19 deletions

diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 2fe6ee1960..adc9192060 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -28,17 +28,20 @@
 #include "projectconfiguration.h"
 #include "projectexplorer_export.h"
 
+#include <utils/qtcassert.h>
+
 #include <QFutureInterface>
 #include <QWidget>
 
 namespace ProjectExplorer {
-class Task;
+
 class BuildConfiguration;
+class BuildStepConfigWidget;
+class BuildStepFactory;
 class BuildStepList;
 class DeployConfiguration;
 class Target;
-
-class BuildStepConfigWidget;
+class Task;
 
 // Documentation inside.
 class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration
@@ -46,14 +49,12 @@ class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration
     Q_OBJECT
 
 protected:
-    BuildStep(BuildStepList *bsl, Core::Id id);
-    BuildStep(BuildStepList *bsl, BuildStep *bs);
+    friend class BuildStepFactory;
+    explicit BuildStep(BuildStepList *bsl, Core::Id id);
 
 public:
     virtual bool init(QList<const BuildStep *> &earlierSteps) = 0;
-
     virtual void run(QFutureInterface<bool> &fi) = 0;
-
     virtual BuildStepConfigWidget *createConfigWidget() = 0;
 
     virtual bool immutable() const;
@@ -97,8 +98,6 @@ signals:
     void enabledChanged();
 
 private:
-    void ctor();
-
     bool m_enabled = true;
 };
 
@@ -111,27 +110,58 @@ public:
         UniqueStep  = 1 << 8    // Can't be used twice in a BuildStepList
     };
 
-    BuildStepInfo() {}
-    BuildStepInfo(Core::Id id, const QString &displayName, Flags flags = Flags())
-        : id(id), displayName(displayName), flags(flags)
-    {}
+    using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>;
 
     Core::Id id;
     QString displayName;
     Flags flags = Flags();
+    BuildStepCreator creator;
 };
 
-class PROJECTEXPLORER_EXPORT IBuildStepFactory : public QObject
+class PROJECTEXPLORER_EXPORT BuildStepFactory : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit IBuildStepFactory(QObject *parent = nullptr);
+    BuildStepFactory();
+
+    BuildStepInfo stepInfo() const;
+    Core::Id stepId() const;
+    BuildStep *create(BuildStepList *parent, Core::Id id);
+    BuildStep *restore(BuildStepList *parent, const QVariantMap &map);
+    BuildStep *clone(BuildStepList *parent, BuildStep *product);
+
+    virtual bool canHandle(BuildStepList *bsl) const;
+
+protected:
+    using BuildStepCreator = std::function<BuildStep *(BuildStepList *)>;
+
+    template <class BuildStepType>
+    void registerStep(Core::Id id)
+    {
+        QTC_CHECK(!m_info.creator);
+        m_info.id = id;
+        m_info.creator = [](BuildStepList *bsl) { return new BuildStepType(bsl); };
+    }
+
+    void setSupportedStepList(Core::Id id);
+    void setSupportedStepLists(const QList<Core::Id> &ids);
+    void setSupportedConfiguration(Core::Id id);
+    void setSupportedProjectType(Core::Id id);
+    void setSupportedDeviceType(Core::Id id);
+    void setSupportedDeviceTypes(const QList<Core::Id> &ids);
+    void setRepeatable(bool on) { m_isRepeatable = on; }
+    void setDisplayName(const QString &displayName);
+    void setFlags(BuildStepInfo::Flags flags);
+
+private:
+    BuildStepInfo m_info;
 
-    virtual QList<BuildStepInfo> availableSteps(BuildStepList *parent) const = 0;
-    virtual BuildStep *create(BuildStepList *parent, Core::Id id) = 0;
-    virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map);
-    virtual BuildStep *clone(BuildStepList *parent, BuildStep *product) = 0;
+    Core::Id m_supportedProjectType;
+    QList<Core::Id> m_supportedDeviceTypes;
+    QList<Core::Id> m_supportedStepLists;
+    Core::Id m_supportedConfiguration;
+    bool m_isRepeatable = true;
 };
 
 class PROJECTEXPLORER_EXPORT BuildStepConfigWidget : public QWidget