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

Make BuildSteps one instance per BuildConfiguration

Browse Source 
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. :)
This commit is contained in:
dt
2009-10-27 14:16:28 +01:00
parent ab038986a2
commit 0d162be22f
41 changed files with 782 additions and 1393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
src/plugins/qmlprojectmanager/qmlmakestep.cpp
View File

@@ -1,163 +0,0 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#include "qmlmakestep.h"
#include "qmlprojectconstants.h"
#include "qmlproject.h"
#include <QtGui/QFormLayout>
#include <QtGui/QGroupBox>
#include <QtGui/QCheckBox>
#include <QtGui/QLineEdit>
#include <QtGui/QListWidget>
using namespace QmlProjectManager;
using namespace QmlProjectManager::Internal;
QmlMakeStep::QmlMakeStep(QmlProject *pro)
: AbstractMakeStep(pro), m_pro(pro)
{
}
QmlMakeStep::~QmlMakeStep()
{
}
bool QmlMakeStep::init(const QString &buildConfiguration)
{
return AbstractMakeStep::init(buildConfiguration);
}
void QmlMakeStep::run(QFutureInterface<bool> &fi)
{
m_futureInterface = &fi;
m_futureInterface->setProgressRange(0, 100);
AbstractMakeStep::run(fi);
m_futureInterface->setProgressValue(100);
m_futureInterface = 0;
}
QString QmlMakeStep::name()
{
return Constants::MAKESTEP;
}
QString QmlMakeStep::displayName()
{
return QLatin1String("QML Make");
}
ProjectExplorer::BuildStepConfigWidget *QmlMakeStep::createConfigWidget()
{
return new QmlMakeStepConfigWidget(this);
}
bool QmlMakeStep::immutable() const
{
return true;
}
void QmlMakeStep::stdOut(const QString &line)
{
AbstractMakeStep::stdOut(line);
}
QmlProject *QmlMakeStep::project() const
{
return m_pro;
}
bool QmlMakeStep::buildsTarget(const QString &, const QString &) const
{
return true;
}
void QmlMakeStep::setBuildTarget(const QString &, const QString &, bool)
{
}
QStringList QmlMakeStep::additionalArguments(const QString &) const
{
return QStringList();
}
void QmlMakeStep::setAdditionalArguments(const QString &, const QStringList &)
{
}
//
// QmlMakeStepConfigWidget
//
QmlMakeStepConfigWidget::QmlMakeStepConfigWidget(QmlMakeStep *makeStep)
: m_makeStep(makeStep)
{
}
QString QmlMakeStepConfigWidget::displayName() const
{
return QLatin1String("QML Make");
}
void QmlMakeStepConfigWidget::init(const QString &)
{
}
QString QmlMakeStepConfigWidget::summaryText() const
{
return tr("<b>QML Make</b>");
}
//
// QmlMakeStepFactory
//
bool QmlMakeStepFactory::canCreate(const QString &name) const
{
return (Constants::MAKESTEP == name);
}
ProjectExplorer::BuildStep *QmlMakeStepFactory::create(ProjectExplorer::Project *project, const QString &name) const
{
Q_ASSERT(name == Constants::MAKESTEP);
QmlProject *pro = qobject_cast<QmlProject *>(project);
Q_ASSERT(pro);
return new QmlMakeStep(pro);
}
QStringList QmlMakeStepFactory::canCreateForProject(ProjectExplorer::Project *) const
{
return QStringList();
}
QString QmlMakeStepFactory::displayNameForName(const QString &) const
{
return QLatin1String("QML Make");
}

99
src/plugins/qmlprojectmanager/qmlmakestep.h
View File

@@ -1,99 +0,0 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#ifndef QMLMAKESTEP_H
#define QMLMAKESTEP_H
#include <projectexplorer/abstractmakestep.h>
namespace QmlProjectManager {
namespace Internal {
class QmlProject;
class QmlMakeStep : public ProjectExplorer::AbstractMakeStep
{
Q_OBJECT
public:
QmlMakeStep(QmlProject *pro);
virtual ~QmlMakeStep();
virtual bool init(const QString &buildConfiguration);
virtual void run(QFutureInterface<bool> &fi);
virtual QString name();
virtual QString displayName();
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
virtual bool immutable() const;
QmlProject *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);
protected:
virtual void stdOut(const QString &line);
private:
QmlProject *m_pro;
QFutureInterface<bool> *m_futureInterface;
};
class QmlMakeStepConfigWidget :public ProjectExplorer::BuildStepConfigWidget
{
Q_OBJECT
public:
QmlMakeStepConfigWidget(QmlMakeStep *makeStep);
virtual QString displayName() const;
virtual void init(const QString &buildConfiguration);
virtual QString summaryText() const;
private:
QmlMakeStep *m_makeStep;
};
class QmlMakeStepFactory : public ProjectExplorer::IBuildStepFactory
{
public:
virtual bool canCreate(const QString &name) const;
virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, const QString &name) const;
virtual QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
virtual QString displayNameForName(const QString &name) const;
};
} // namespace Internal
} // namespace QmlProjectManager
#endif // MAKESTEP_H

15
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -29,7 +29,6 @@
#include "qmlproject.h"
#include "qmlprojectconstants.h"
#include "qmlmakestep.h"
#include <projectexplorer/toolchain.h>
#include <projectexplorer/persistentsettings.h>
@@ -242,15 +241,6 @@ QStringList QmlProject::targets() const
return targets;
}
QmlMakeStep *QmlProject::makeStep() const
{
foreach (ProjectExplorer::BuildStep *bs, buildSteps()) {
if (QmlMakeStep *ms = qobject_cast<QmlMakeStep *>(bs))
return ms;
}
return 0;
}
bool QmlProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader)
{
Project::restoreSettingsImpl(reader);
@@ -260,11 +250,6 @@ bool QmlProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &
addRunConfiguration(runConf);
}
if (buildSteps().isEmpty()) {
QmlMakeStep *makeStep = new QmlMakeStep(this);
insertBuildStep(0, makeStep);
}
refresh(Everything);
return true;
}

1
src/plugins/qmlprojectmanager/qmlproject.h
View File

@@ -81,7 +81,6 @@ public:
virtual QStringList files(FilesMode fileMode) const;
QStringList targets() const;
QmlMakeStep *makeStep() const;
QString buildParser(ProjectExplorer::BuildConfiguration *configuration) const;
enum RefreshOptions {

6
src/plugins/qmlprojectmanager/qmlprojectmanager.pro
View File

@@ -9,18 +9,16 @@ HEADERS = qmlproject.h \
qmlprojectnodes.h \
qmlprojectwizard.h \
qmlnewprojectwizard.h \
qmlprojectfileseditor.h \
qmltaskmanager.h \
qmlmakestep.h
qmlprojectfileseditor.h
SOURCES = qmlproject.cpp \
qmlprojectplugin.cpp \
qmlprojectmanager.cpp \
qmlprojectnodes.cpp \
qmlprojectwizard.cpp \
qmlnewprojectwizard.cpp \
qmlprojectfileseditor.cpp \
qmltaskmanager.cpp \
qmlmakestep.cpp
qmlprojectfileseditor.cpp
RESOURCES += qmlproject.qrc
OTHER_FILES += QmlProjectManager.pluginspec

3
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -34,7 +34,6 @@
#include "qmlprojectconstants.h"
#include "qmlprojectfileseditor.h"
#include "qmlproject.h"
#include "qmlmakestep.h"
#include "qmltaskmanager.h"
#include <extensionsystem/pluginmanager.h>
@@ -89,8 +88,6 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
addAutoReleasedObject(new QmlRunConfigurationFactory);
addAutoReleasedObject(new QmlNewProjectWizard);
addAutoReleasedObject(new QmlProjectWizard);
addAutoReleasedObject(new QmlMakeStepFactory);
return true;
}