Allow the user to restrict rc creation to certain .pro

Task-number: QTCREATORBUG-10953
Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/libs/utils/algorithm.h

@@ -37,6 +37,25 @@
 namespace Utils
 {
 
+template<typename T, typename F>
+bool anyOf(const T &container, F predicate)
+{
+    return std::any_of(container.begin(), container.end(), predicate);
+}
+
+template<typename T, typename F>
+bool allOf(const T &container, F predicate)
+{
+    return std::all_of(container.begin(), container.end(), predicate);
+}
+
+template<typename T, typename F>
+void erase(QList<T> &container, F predicate)
+{
+    container.erase(std::remove_if(container.begin(), container.end(), predicate),
+                    container.end());
+}
+
 // Note: add overloads for other container types as needed
 template<typename T, typename F>
 Q_REQUIRED_RESULT

src/plugins/android/androidrunfactories.cpp

@@ -85,17 +85,20 @@ bool AndroidRunConfigurationFactory::canClone(Target *parent, RunConfiguration *
     return canCreate(parent, source->id());
 }
 
-QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
-    QList<Core::Id> ids;
     if (!AndroidManager::supportsAndroid(parent))
-        return ids;
+        return QList<Core::Id>();
 
     QmakeProject *project = static_cast<QmakeProject *>(parent->project());
 
     QList<QmakeProFileNode *> nodes = project->allProFiles(QList<QmakeProjectType>()
                                                            << ApplicationTemplate
                                                            << LibraryTemplate);
+
+    if (mode == AutoCreate)
+        nodes = QmakeProject::nodesWithQtcRunnable(nodes);
+
     const Core::Id base = Core::Id(ANDROID_RC_ID_PREFIX);
     return QmakeProject::idsForNodes(base, nodes);
 }

src/plugins/android/androidrunfactories.h

@@ -51,7 +51,7 @@ public:
     explicit AndroidRunConfigurationFactory(QObject *parent = 0);
 
     QString displayNameForId(const Core::Id id) const;
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const;
 
     bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
 

src/plugins/baremetal/baremetalrunconfigurationfactory.cpp

@@ -84,8 +84,9 @@ bool BareMetalRunConfigurationFactory::canClone(Target *parent, RunConfiguration
     return bmrc && canCreate(parent, source->id());
 }
 
-QList<Core::Id> BareMetalRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> BareMetalRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
+    Q_UNUSED(mode)
     QList<Core::Id> result;
     if (!canHandle(parent))
         return result;

src/plugins/baremetal/baremetalrunconfigurationfactory.h

@@ -42,7 +42,7 @@ public:
     ~BareMetalRunConfigurationFactory();
 
     QString displayNameForId(const Core::Id id) const;
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
 
     bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -352,8 +352,9 @@ CMakeRunConfigurationFactory::~CMakeRunConfigurationFactory()
 }
 
 // used to show the list of possible additons to a project, returns a list of ids
-QList<Core::Id> CMakeRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> CMakeRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
+    Q_UNUSED(mode)
     if (!canHandle(parent))
         return QList<Core::Id>();
     CMakeProject *project = static_cast<CMakeProject *>(parent->project());

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -138,7 +138,7 @@ public:
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const;
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product);
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
     QString displayNameForId(const Core::Id id) const;
 
     static Core::Id idFromBuildTarget(const QString &target);

src/plugins/ios/iosrunfactories.cpp

@@ -59,7 +59,11 @@ namespace Internal {
 
 static QString pathFromId(const Core::Id id)
 {
-    return id.suffixAfter(IOS_RC_ID_PREFIX);
+    QString pathStr = id.toString();
+    const QString prefix = QLatin1String(IOS_RC_ID_PREFIX);
+    if (!pathStr.startsWith(prefix))
+        return QString();
+    return pathStr.mid(prefix.size());
 }
 
 IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent)
@@ -88,19 +92,19 @@ bool IosRunConfigurationFactory::canClone(Target *parent, RunConfiguration *sour
     return canCreate(parent, source->id());
 }
 
-QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
-    QList<Core::Id> ids;
     if (!IosManager::supportsIos(parent))
-        return ids;
-    Core::Id baseId(IOS_RC_ID_PREFIX);
+        return QList<Core::Id>();
     QmakeProject *project = static_cast<QmakeProject *>(parent->project());
 
     QList<QmakeProFileNode *> nodes = project->allProFiles(QList<QmakeProjectType>()
                                                            << ApplicationTemplate
                                                            << LibraryTemplate
                                                            << AuxTemplate);
-
+    if (mode == AutoCreate)
+        nodes = QmakeProject::nodesWithQtcRunnable(nodes);
+    Core::Id baseId(IOS_RC_ID_PREFIX);
     return QmakeProject::idsForNodes(baseId, nodes);
 }
 

src/plugins/ios/iosrunfactories.h

@@ -51,7 +51,7 @@ public:
     explicit IosRunConfigurationFactory(QObject *parent = 0);
 
     QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const QTC_OVERRIDE;
 
     bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const QTC_OVERRIDE;
 

src/plugins/projectexplorer/runconfiguration.h

@@ -217,7 +217,8 @@ public:
     explicit IRunConfigurationFactory(QObject *parent = 0);
     virtual ~IRunConfigurationFactory();
 
-    virtual QList<Core::Id> availableCreationIds(Target *parent) const = 0;
+    enum CreationMode {UserCreate, AutoCreate};
+    virtual QList<Core::Id> availableCreationIds(Target *parent, CreationMode mode = UserCreate) const = 0;
     virtual QString displayNameForId(const Core::Id id) const = 0;
 
     virtual bool canCreate(Target *parent, const Core::Id id) const = 0;

src/plugins/projectexplorer/target.cpp

@@ -599,26 +599,31 @@ void Target::updateDefaultRunConfigurations()
     int configuredCount = existingConfigured.count();
 
     // find all RC ids that can get created:
-    QList<Core::Id> factoryIds;
+    QList<Core::Id> availableFactoryIds;
     foreach (IRunConfigurationFactory *rcFactory, rcFactories)
-        factoryIds.append(rcFactory->availableCreationIds(this));
+        availableFactoryIds.append(rcFactory->availableCreationIds(this));
+
+    QList<Core::Id> autoCreateFactoryIds;
+    foreach (IRunConfigurationFactory *rcFactory, rcFactories)
+        autoCreateFactoryIds.append(rcFactory->availableCreationIds(this,
+                                                                    IRunConfigurationFactory::AutoCreate));
 
     // Put outdated RCs into toRemove, do not bother with factories
     // that produce already existing RCs
     QList<RunConfiguration *> toRemove;
     QList<Core::Id> toIgnore;
     foreach (RunConfiguration *rc, existingConfigured) {
-        if (factoryIds.contains(rc->id()))
+        if (availableFactoryIds.contains(rc->id()))
             toIgnore.append(rc->id()); // Already there
         else
             toRemove << rc;
     }
     foreach (Core::Id i, toIgnore)
-        factoryIds.removeAll(i);
+        autoCreateFactoryIds.removeAll(i);
     configuredCount -= toRemove.count();
 
     // Create new RCs and put them into newConfigured/newUnconfigured
-    foreach (Core::Id id, factoryIds) {
+    foreach (Core::Id id, autoCreateFactoryIds) {
         IRunConfigurationFactory *factory = 0;
         foreach (IRunConfigurationFactory *i, rcFactories) {
             if (i->canCreate(this, id)) {

src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

@@ -550,8 +550,9 @@ RunConfiguration *QbsRunConfigurationFactory::clone(Target *parent, RunConfigura
     return new QbsRunConfiguration(parent, old);
 }
 
-QList<Core::Id> QbsRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> QbsRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
+    Q_UNUSED(mode)
     QList<Core::Id> result;
     if (!canHandle(parent))
         return result;

src/plugins/qbsprojectmanager/qbsrunconfiguration.h

@@ -181,7 +181,7 @@ public:
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const;
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
     QString displayNameForId(const Core::Id id) const;
 
 private:

src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp

@@ -667,14 +667,15 @@ RunConfiguration *DesktopQmakeRunConfigurationFactory::clone(Target *parent, Run
     return new DesktopQmakeRunConfiguration(parent, old);
 }
 
-QList<Core::Id> DesktopQmakeRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> DesktopQmakeRunConfigurationFactory::availableCreationIds(Target *parent, CreationMode mode) const
 {
-    QList<Core::Id> result;
     if (!canHandle(parent))
-        return result;
+        return QList<Core::Id>();
 
     QmakeProject *project = static_cast<QmakeProject *>(parent->project());
     QList<QmakeProFileNode *> nodes = project->applicationProFiles();
+    if (mode == AutoCreate)
+        nodes = QmakeProject::nodesWithQtcRunnable(nodes);
     return QmakeProject::idsForNodes(Core::Id(QMAKE_RC_PREFIX), nodes);
 }
 

src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h

@@ -193,7 +193,7 @@ public:
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const;
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
     QString displayNameForId(const Core::Id id) const;
 
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,

src/plugins/qmakeprojectmanager/qmakenodes.cpp

@@ -1591,6 +1591,12 @@ bool QmakeProFileNode::isDebugAndRelease() const
     return configValues.contains(QLatin1String("debug_and_release"));
 }
 
+bool QmakeProFileNode::isQtcRunnable() const
+{
+    const QStringList configValues = m_varValues.value(ConfigVar);
+    return configValues.contains(QLatin1String("qtc_runnable"));
+}
+
 QmakeProjectType QmakeProFileNode::projectType() const
 {
     return m_projectType;

src/plugins/qmakeprojectmanager/qmakenodes.h

@@ -410,6 +410,7 @@ public:
 
     bool showInSimpleTree(QmakeProjectType projectType) const;
     bool isDebugAndRelease() const;
+    bool isQtcRunnable() const;
 
     void setParseInProgress(bool b);
     void setParseInProgressRecursive(bool b);

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -1103,6 +1103,17 @@ bool QmakeProject::hasApplicationProFile(const QString &path) const
     return false;
 }
 
+QList<QmakeProFileNode *> QmakeProject::nodesWithQtcRunnable(QList<QmakeProFileNode *> nodes)
+{
+    std::function<bool (QmakeProFileNode *)> hasQtcRunnable = [](QmakeProFileNode *node) {
+        return node->isQtcRunnable();
+    };
+
+    if (anyOf(nodes, hasQtcRunnable))
+        erase(nodes, std::not1(hasQtcRunnable));
+    return nodes;
+}
+
 QList<Core::Id> QmakeProject::idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes)
 {
     return Utils::transform(nodes, [&base](QmakeProFileNode *node) {

src/plugins/qmakeprojectmanager/qmakeproject.h

@@ -92,6 +92,7 @@ public:
     QList<QmakeProFileNode *> applicationProFiles(Parsing parse = ExactParse) const;
     bool hasApplicationProFile(const QString &path) const;
 
+    static QList<QmakeProFileNode *> nodesWithQtcRunnable(QList<QmakeProFileNode *> nodes);
     static QList<Core::Id> idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes);
 
     void notifyChanged(const QString &name);

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp

@@ -50,8 +50,9 @@ QmlProjectRunConfigurationFactory::~QmlProjectRunConfigurationFactory()
 {
 }
 
-QList<Core::Id> QmlProjectRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> QmlProjectRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const
 {
+    Q_UNUSED(mode)
     if (!canHandle(parent))
         return QList<Core::Id>();