Make BuildSteps one instance per BuildConfiguration

Enables users to change which buildsteps get run per buildconfiguration. Some further tweaks are probably necessary. This is a rather big change, though it should work. :)
2009-10-27 14:16:28 +01:00
parent ab038986a2
commit 0d162be22f
41 changed files with 782 additions and 1393 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -105,6 +105,13 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
        return false;
    BuildConfiguration *bc = new BuildConfiguration(buildConfigurationName);

+    MakeStep *makeStep = new MakeStep(m_project, bc);
+    bc->insertBuildStep(0, makeStep);
+
+    MakeStep *cleanMakeStep = new MakeStep(m_project, bc);
+    bc->insertCleanStep(0, cleanMakeStep);
+    cleanMakeStep->setClean(true);
+
    CMakeOpenProjectWizard copw(m_project->projectManager(),
                                m_project->sourceDirectory(),
                                m_project->buildDirectory(bc),
@@ -114,12 +121,14 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
        return false;
    }
    m_project->addBuildConfiguration(bc); // this also makes the name unique
-    // Default to all
-    if (m_project->targets().contains("all"))
-        m_project->makeStep()->setBuildTarget(buildConfigurationName, "all", true);
+
    bc->setValue("buildDirectory", copw.buildDirectory());
    bc->setValue("msvcVersion", copw.msvcVersion());
    m_project->parseCMakeLists();
+
+    // Default to all
+    if (m_project->targets().contains("all"))
+        makeStep->setBuildTarget("all", true);
    return true;
 }

@@ -627,17 +636,6 @@ void CMakeProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &w
    Project::saveSettingsImpl(writer);
 }

-MakeStep *CMakeProject::makeStep() const
-{
-    foreach (ProjectExplorer::BuildStep *bs, buildSteps()) {
-        MakeStep *ms = qobject_cast<MakeStep *>(bs);
-        if (ms)
-            return ms;
-    }
-    return 0;
-}
-
-
 bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader)
 {
    Project::restoreSettingsImpl(reader);
@@ -651,22 +649,19 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
        if (copw.exec() != QDialog::Accepted)
            return false;

-        qDebug()<<"ccd.buildDirectory()"<<copw.buildDirectory();
-
-        // Now create a standard build configuration
-        makeStep = new MakeStep(this);
-
-        insertBuildStep(0, makeStep);
-
        ProjectExplorer::BuildConfiguration *bc = new ProjectExplorer::BuildConfiguration("all");
        addBuildConfiguration(bc);
        bc->setValue("msvcVersion", copw.msvcVersion());
        if (!copw.buildDirectory().isEmpty())
            bc->setValue("buildDirectory", copw.buildDirectory());
-        //TODO save arguments somewhere copw.arguments()

-        MakeStep *cleanMakeStep = new MakeStep(this);
-        insertCleanStep(0, cleanMakeStep);
+        // Now create a standard build configuration
+        makeStep = new MakeStep(this, bc);
+        bc->insertBuildStep(0, makeStep);
+
+        //TODO save arguments somewhere copw.arguments()
+        MakeStep *cleanMakeStep = new MakeStep(this, bc);
+        bc->insertCleanStep(0, cleanMakeStep);
        cleanMakeStep->setClean(true);
        setActiveBuildConfiguration(bc);
    } else {
@@ -697,15 +692,15 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
        }
    }

-    if (!hasUserFile && targets().contains("all"))
-        makeStep->setBuildTarget("all", "all", true);
-
    m_watcher = new ProjectExplorer::FileWatcher(this);
    connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
    bool result = parseCMakeLists(); // Gets the directory from the active buildconfiguration
    if (!result)
        return false;

+    if (!hasUserFile && targets().contains("all"))
+        makeStep->setBuildTarget("all", true);
+
    connect(this, SIGNAL(activeBuildConfigurationChanged()),
            this, SLOT(slotActiveBuildConfiguration()));
    return true;
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -113,7 +113,6 @@ public:
    virtual ProjectExplorer::ProjectNode *rootProjectNode() const;

    virtual QStringList files(FilesMode fileMode) const;
-    MakeStep *makeStep() const;
    QStringList targets() const;
    QString buildParser(ProjectExplorer::BuildConfiguration *configuration) const;
    CMakeTarget targetForTitle(const QString &title);
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -40,13 +40,25 @@

 using namespace CMakeProjectManager;
 using namespace CMakeProjectManager::Internal;
+using namespace ProjectExplorer;

-MakeStep::MakeStep(CMakeProject *pro)
-    : AbstractMakeStep(pro), m_pro(pro), m_clean(false)
+MakeStep::MakeStep(CMakeProject *pro, BuildConfiguration *bc)
+    : AbstractMakeStep(pro, bc), m_pro(pro), m_clean(false), m_futureInterface(0)
 {
    m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]");
 }

+MakeStep::MakeStep(MakeStep *bs, BuildConfiguration *bc)
+    : AbstractMakeStep(bs, bc),
+    m_pro(bs->m_pro),
+    m_clean(bs->m_clean),
+    m_futureInterface(0),
+    m_buildTargets(bs->m_buildTargets),
+    m_additionalArguments(bs->m_buildTargets)
+{
+
+}
+
 MakeStep::~MakeStep()
 {

@@ -57,53 +69,34 @@ void MakeStep::setClean(bool clean)
    m_clean = clean;
 }

-void MakeStep::restoreFromMap(const QMap<QString, QVariant> &map)
+void MakeStep::restoreFromGlobalMap(const QMap<QString, QVariant> &map)
 {
    if (map.value("clean").isValid() && map.value("clean").toBool())
        m_clean = true;
-    ProjectExplorer::AbstractMakeStep::restoreFromMap(map);
+    AbstractMakeStep::restoreFromGlobalMap(map);
 }

-void MakeStep::storeIntoMap(QMap<QString, QVariant> &map)
+void MakeStep::restoreFromLocalMap(const QMap<QString, QVariant> &map)
 {
+    m_buildTargets = map["buildTargets"].toStringList();
+    m_additionalArguments = map["additionalArguments"].toStringList();
+    if (map.value("clean").isValid() && map.value("clean").toBool())
+        m_clean = true;
+    AbstractMakeStep::restoreFromLocalMap(map);
+}
+
+void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
+{
+    map["buildTargets"] = m_buildTargets;
+    map["additionalArguments"] = m_additionalArguments;
    if (m_clean)
        map["clean"] = true;
-    ProjectExplorer::AbstractMakeStep::storeIntoMap(map);
+    AbstractMakeStep::storeIntoLocalMap(map);
 }

-void MakeStep::restoreFromMap(const QString &buildConfiguration, const QMap<QString, QVariant> &map)
+bool MakeStep::init()
 {
-    m_values[buildConfiguration].buildTargets = map["buildTargets"].toStringList();
-    m_values[buildConfiguration].additionalArguments = map["additionalArguments"].toStringList();
-    ProjectExplorer::AbstractMakeStep::restoreFromMap(buildConfiguration, map);
-}
-
-void MakeStep::storeIntoMap(const QString &buildConfiguration, QMap<QString, QVariant> &map)
-{
-    map["buildTargets"] = m_values.value(buildConfiguration).buildTargets;
-    map["additionalArguments"] = m_values.value(buildConfiguration).additionalArguments;
-    ProjectExplorer::AbstractMakeStep::storeIntoMap(buildConfiguration, map);
-}
-
-
-void MakeStep::addBuildConfiguration(const QString & name)
-{
-    m_values.insert(name, MakeStepSettings());
-}
-
-void MakeStep::removeBuildConfiguration(const QString & name)
-{
-    m_values.remove(name);
-}
-
-void MakeStep::copyBuildConfiguration(const QString &source, const QString &dest)
-{
-    m_values.insert(dest, m_values.value(source));
-}
-
-bool MakeStep::init(const QString &buildConfiguration)
-{
-    ProjectExplorer::BuildConfiguration *bc = m_pro->buildConfiguration(buildConfiguration);
+    BuildConfiguration *bc = buildConfiguration();
    setBuildParser(m_pro->buildParser(bc));

    setEnabled(true);
@@ -111,13 +104,13 @@ bool MakeStep::init(const QString &buildConfiguration)

    setCommand(m_pro->toolChain(bc)->makeCommand());

-    QStringList arguments = m_values.value(buildConfiguration).buildTargets;
-    arguments << additionalArguments(buildConfiguration);
-    setArguments(arguments); // TODO
+    QStringList arguments = m_buildTargets;
+    arguments << additionalArguments();
+    setArguments(arguments);
    setEnvironment(m_pro->environment(bc));
    setIgnoreReturnValue(m_clean);

-    return AbstractMakeStep::init(buildConfiguration);
+    return AbstractMakeStep::init();
 }

 void MakeStep::run(QFutureInterface<bool> &fi)
@@ -140,7 +133,7 @@ QString MakeStep::displayName()
    return "Make";
 }

-ProjectExplorer::BuildStepConfigWidget *MakeStep::createConfigWidget()
+BuildStepConfigWidget *MakeStep::createConfigWidget()
 {
    return new MakeStepConfigWidget(this);
 }
@@ -166,29 +159,29 @@ CMakeProject *MakeStep::project() const
    return m_pro;
 }

-bool MakeStep::buildsTarget(const QString &buildConfiguration, const QString &target) const
+bool MakeStep::buildsTarget(const QString &target) const
 {
-    return m_values.value(buildConfiguration).buildTargets.contains(target);
+    return m_buildTargets.contains(target);
 }

-void MakeStep::setBuildTarget(const QString &buildConfiguration, const QString &target, bool on)
+void MakeStep::setBuildTarget(const QString &target, bool on)
 {
-    QStringList old = m_values.value(buildConfiguration).buildTargets;
+    QStringList old = m_buildTargets;
    if (on && !old.contains(target))
        old << target;
    else if(!on && old.contains(target))
        old.removeOne(target);
-    m_values[buildConfiguration].buildTargets = old;
+    m_buildTargets = old;
 }

-QStringList MakeStep::additionalArguments(const QString &buildConfiguration) const
+QStringList MakeStep::additionalArguments() const
 {
-    return m_values.value(buildConfiguration).additionalArguments;
+    return m_additionalArguments;
 }

-void MakeStep::setAdditionalArguments(const QString &buildConfiguration, const QStringList &list)
+void MakeStep::setAdditionalArguments(const QStringList &list)
 {
-    m_values[buildConfiguration].additionalArguments = list;
+    m_additionalArguments = list;
 }

 //
@@ -227,13 +220,13 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)

 void MakeStepConfigWidget::additionalArgumentsEdited()
 {
-    m_makeStep->setAdditionalArguments(m_buildConfiguration, ProjectExplorer::Environment::parseCombinedArgString(m_additionalArguments->text()));
+    m_makeStep->setAdditionalArguments(Environment::parseCombinedArgString(m_additionalArguments->text()));
    updateDetails();
 }

 void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
 {
-    m_makeStep->setBuildTarget(m_buildConfiguration, item->text(), item->checkState() & Qt::Checked);
+    m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
    updateDetails();
 }

@@ -242,30 +235,29 @@ QString MakeStepConfigWidget::displayName() const
    return "Make";
 }

-void MakeStepConfigWidget::init(const QString &buildConfiguration)
+void MakeStepConfigWidget::init()
 {
    // disconnect to make the changes to the items
    disconnect(m_targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
-    m_buildConfiguration = buildConfiguration;
    int count = m_targetsList->count();
    for(int i = 0; i < count; ++i) {
        QListWidgetItem *item = m_targetsList->item(i);
-        item->setCheckState(m_makeStep->buildsTarget(buildConfiguration, item->text()) ? Qt::Checked : Qt::Unchecked);
+        item->setCheckState(m_makeStep->buildsTarget(item->text()) ? Qt::Checked : Qt::Unchecked);
    }
    // and connect again
    connect(m_targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));

-    m_additionalArguments->setText(ProjectExplorer::Environment::joinArgumentList(m_makeStep->additionalArguments(m_buildConfiguration)));
+    m_additionalArguments->setText(Environment::joinArgumentList(m_makeStep->additionalArguments()));
    updateDetails();
 }

 void MakeStepConfigWidget::updateDetails()
 {
-    QStringList arguments = m_makeStep->m_values.value(m_buildConfiguration).buildTargets;
-    arguments << m_makeStep->additionalArguments(m_buildConfiguration);
+    QStringList arguments = m_makeStep->m_buildTargets;
+    arguments << m_makeStep->additionalArguments();
    m_summaryText = tr("<b>Make:</b> %1 %2")
                    .arg(m_makeStep->project()->toolChain(
-                            m_makeStep->project()->buildConfiguration(m_buildConfiguration))
+                            m_makeStep->buildConfiguration())
                            ->makeCommand(),
                         arguments.join(" "));
    emit updateSummary();
@@ -285,15 +277,20 @@ bool MakeStepFactory::canCreate(const QString &name) const
    return (Constants::MAKESTEP == name);
 }

-ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::Project *project, const QString &name) const
+BuildStep *MakeStepFactory::create(Project *project, BuildConfiguration *bc, const QString &name) const
 {
    Q_ASSERT(name == Constants::MAKESTEP);
    CMakeProject *pro = qobject_cast<CMakeProject *>(project);
    Q_ASSERT(pro);
-    return new MakeStep(pro);
+    return new MakeStep(pro, bc);
 }

-QStringList MakeStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
+BuildStep *MakeStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const
+{
+    return new MakeStep(static_cast<MakeStep *>(bs), bc);
+}
+
+QStringList MakeStepFactory::canCreateForProject(Project * /* pro */) const
 {
    return QStringList();
 }
--- a/src/plugins/cmakeprojectmanager/makestep.h
+++ b/src/plugins/cmakeprojectmanager/makestep.h
@@ -43,21 +43,16 @@ namespace Internal {

 class CMakeProject;

-struct MakeStepSettings
-{
-    QStringList buildTargets;
-    QStringList additionalArguments;
-};
-
 class MakeStep : public ProjectExplorer::AbstractMakeStep
 {
    Q_OBJECT
    friend class MakeStepConfigWidget; // TODO remove
-    // This is for modifying m_values
+    // This is for modifying internal data
 public:
-    MakeStep(CMakeProject *pro);
+    MakeStep(CMakeProject *pro, ProjectExplorer::BuildConfiguration *bc);
+    MakeStep(MakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
    ~MakeStep();
-    virtual bool init(const QString &buildConfiguration);
+    virtual bool init();

    virtual void run(QFutureInterface<bool> &fi);

@@ -66,22 +61,18 @@ public:
    virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
    virtual bool immutable() const;
    CMakeProject *project() const;
-    bool buildsTarget(const QString &buildConfiguration, const QString &target) const;
-    void setBuildTarget(const QString &buildConfiguration, const QString &target, bool on);
-    QStringList additionalArguments(const QString &buildConfiguration) const;
-    void setAdditionalArguments(const QString &buildConfiguration, const QStringList &list);
+    bool buildsTarget(const QString &target) const;
+    void setBuildTarget(const QString &target, bool on);
+    QStringList additionalArguments() const;
+    void setAdditionalArguments(const QStringList &list);

-    virtual void restoreFromMap(const QMap<QString, QVariant> &map);
-    virtual void storeIntoMap(QMap<QString, QVariant> &map);
+    virtual void restoreFromGlobalMap(const QMap<QString, QVariant> &map);
+
+    virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map);
+    virtual void storeIntoLocalMap(QMap<QString, QVariant> &map);

    void setClean(bool clean);

-    virtual void restoreFromMap(const QString &buildConfiguration, const QMap<QString, QVariant> &map);
-    virtual void storeIntoMap(const QString &buildConfiguration, QMap<QString, QVariant> &map);
-
-    virtual void addBuildConfiguration(const QString & name);
-    virtual void removeBuildConfiguration(const QString & name);
-    virtual void copyBuildConfiguration(const QString &source, const QString &dest);
 protected:
    // For parsing [ 76%]
    virtual void stdOut(const QString &line);
@@ -90,7 +81,8 @@ private:
    bool m_clean;
    QRegExp m_percentProgress;
    QFutureInterface<bool> *m_futureInterface;
-    QMap<QString, MakeStepSettings> m_values;
+    QStringList m_buildTargets;
+    QStringList m_additionalArguments;
 };

 class MakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
@@ -99,14 +91,13 @@ class MakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
 public:
    MakeStepConfigWidget(MakeStep *makeStep);
    virtual QString displayName() const;
-    virtual void init(const QString &buildConfiguration);
+    virtual void init();
    virtual QString summaryText() const;
 private slots:
    void itemChanged(QListWidgetItem*);
    void additionalArgumentsEdited();
    void updateDetails();
 private:
-    QString m_buildConfiguration;
    MakeStep *m_makeStep;
    QListWidget *m_targetsList;
    QLineEdit *m_additionalArguments;
@@ -116,7 +107,8 @@ private:
 class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
    virtual bool canCreate(const QString &name) const;
-    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, const QString &name) const;
+    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, ProjectExplorer::BuildConfiguration *bc, const QString &name) const;
+    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
    virtual QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
    virtual QString displayNameForName(const QString &name) const;
 };