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

Remove project() from BuildStep

Browse Source 
The project() should in most cases not matter, instead the
BuildConfiguration should. This shows all the information that needs to
move into the BuildConfiguration classes.
This commit is contained in:
dt
2009-11-23 15:47:26 +01:00
parent 20214787d1
commit 60a1ee12ba
22 changed files with 120 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -106,10 +106,10 @@ BuildConfiguration *CMakeBuildConfigurationFactory::create(const QString &type)
return false; return false;
BuildConfiguration *bc = new CMakeBuildConfiguration(m_project, buildConfigurationName); BuildConfiguration *bc = new CMakeBuildConfiguration(m_project, buildConfigurationName);
MakeStep *makeStep = new MakeStep(m_project, bc); MakeStep *makeStep = new MakeStep(bc);
bc->insertBuildStep(0, makeStep); bc->insertBuildStep(0, makeStep);
MakeStep *cleanMakeStep = new MakeStep(m_project, bc); MakeStep *cleanMakeStep = new MakeStep(bc);
bc->insertCleanStep(0, cleanMakeStep); bc->insertCleanStep(0, cleanMakeStep);
cleanMakeStep->setClean(true); cleanMakeStep->setClean(true);
@@ -671,11 +671,11 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
bc->setValue("buildDirectory", copw.buildDirectory()); bc->setValue("buildDirectory", copw.buildDirectory());
// Now create a standard build configuration // Now create a standard build configuration
makeStep = new MakeStep(this, bc); makeStep = new MakeStep(bc);
bc->insertBuildStep(0, makeStep); bc->insertBuildStep(0, makeStep);
//TODO save arguments somewhere copw.arguments() //TODO save arguments somewhere copw.arguments()
MakeStep *cleanMakeStep = new MakeStep(this, bc); MakeStep *cleanMakeStep = new MakeStep(bc);
bc->insertCleanStep(0, cleanMakeStep); bc->insertCleanStep(0, cleanMakeStep);
cleanMakeStep->setClean(true); cleanMakeStep->setClean(true);
setActiveBuildConfiguration(bc); setActiveBuildConfiguration(bc);

26
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -42,15 +42,14 @@ using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
MakeStep::MakeStep(CMakeProject *pro, BuildConfiguration *bc) MakeStep::MakeStep(BuildConfiguration *bc)
: AbstractMakeStep(pro, bc), m_pro(pro), m_clean(false), m_futureInterface(0) : AbstractMakeStep(bc), m_clean(false), m_futureInterface(0)
{ {
m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]"); m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]");
} }
MakeStep::MakeStep(MakeStep *bs, BuildConfiguration *bc) MakeStep::MakeStep(MakeStep *bs, BuildConfiguration *bc)
: AbstractMakeStep(bs, bc), : AbstractMakeStep(bs, bc),
m_pro(bs->m_pro),
m_clean(bs->m_clean), m_clean(bs->m_clean),
m_futureInterface(0), m_futureInterface(0),
m_buildTargets(bs->m_buildTargets), m_buildTargets(bs->m_buildTargets),
@@ -97,17 +96,19 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
bool MakeStep::init() bool MakeStep::init()
{ {
BuildConfiguration *bc = buildConfiguration(); BuildConfiguration *bc = buildConfiguration();
setBuildParser(m_pro->buildParser(bc)); // TODO, we should probably have a member cmakeBuildConfiguration();
CMakeProject *pro = static_cast<CMakeProject *>(buildConfiguration()->project());
setBuildParser(pro->buildParser(bc));
setEnabled(true); setEnabled(true);
setWorkingDirectory(m_pro->buildDirectory(bc)); setWorkingDirectory(pro->buildDirectory(bc));
setCommand(m_pro->toolChain(bc)->makeCommand()); setCommand(pro->toolChain(bc)->makeCommand());
QStringList arguments = m_buildTargets; QStringList arguments = m_buildTargets;
arguments << additionalArguments(); arguments << additionalArguments();
setArguments(arguments); setArguments(arguments);
setEnvironment(m_pro->environment(bc)); setEnvironment(pro->environment(bc));
setIgnoreReturnValue(m_clean); setIgnoreReturnValue(m_clean);
return AbstractMakeStep::init(); return AbstractMakeStep::init();
@@ -154,11 +155,6 @@ void MakeStep::stdOut(const QString &line)
AbstractMakeStep::stdOut(line); AbstractMakeStep::stdOut(line);
} }
CMakeProject *MakeStep::project() const
{
return m_pro;
}
bool MakeStep::buildsTarget(const QString &target) const bool MakeStep::buildsTarget(const QString &target) const
{ {
return m_buildTargets.contains(target); return m_buildTargets.contains(target);
@@ -277,12 +273,10 @@ bool MakeStepFactory::canCreate(const QString &name) const
return (Constants::MAKESTEP == name); return (Constants::MAKESTEP == name);
} }
BuildStep *MakeStepFactory::create(Project *project, BuildConfiguration *bc, const QString &name) const BuildStep *MakeStepFactory::create(BuildConfiguration *bc, const QString &name) const
{ {
Q_ASSERT(name == Constants::MAKESTEP); Q_ASSERT(name == Constants::MAKESTEP);
CMakeProject *pro = qobject_cast<CMakeProject *>(project); return new MakeStep(bc);
Q_ASSERT(pro);
return new MakeStep(pro, bc);
} }
BuildStep *MakeStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const BuildStep *MakeStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const

6
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -49,7 +49,7 @@ class MakeStep : public ProjectExplorer::AbstractMakeStep
friend class MakeStepConfigWidget; // TODO remove friend class MakeStepConfigWidget; // TODO remove
// This is for modifying internal data // This is for modifying internal data
public: public:
MakeStep(CMakeProject *pro, ProjectExplorer::BuildConfiguration *bc); MakeStep(ProjectExplorer::BuildConfiguration *bc);
MakeStep(MakeStep *bs, ProjectExplorer::BuildConfiguration *bc); MakeStep(MakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
~MakeStep(); ~MakeStep();
virtual bool init(); virtual bool init();
@@ -60,7 +60,6 @@ public:
virtual QString displayName(); virtual QString displayName();
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
virtual bool immutable() const; virtual bool immutable() const;
CMakeProject *project() const;
bool buildsTarget(const QString &target) const; bool buildsTarget(const QString &target) const;
void setBuildTarget(const QString &target, bool on); void setBuildTarget(const QString &target, bool on);
QStringList additionalArguments() const; QStringList additionalArguments() const;
@@ -77,7 +76,6 @@ protected:
// For parsing [ 76%] // For parsing [ 76%]
virtual void stdOut(const QString &line); virtual void stdOut(const QString &line);
private: private:
CMakeProject *m_pro;
bool m_clean; bool m_clean;
QRegExp m_percentProgress; QRegExp m_percentProgress;
QFutureInterface<bool> *m_futureInterface; QFutureInterface<bool> *m_futureInterface;
@@ -107,7 +105,7 @@ private:
class MakeStepFactory : public ProjectExplorer::IBuildStepFactory class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
{ {
virtual bool canCreate(const QString &name) const; virtual bool canCreate(const QString &name) const;
virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, ProjectExplorer::BuildConfiguration *bc, const QString &name) const; virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString &name) const;
virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
virtual QStringList canCreateForProject(ProjectExplorer::Project *pro) const; virtual QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
virtual QString displayNameForName(const QString &name) const; virtual QString displayNameForName(const QString &name) const;

34
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -47,13 +47,13 @@
using namespace GenericProjectManager; using namespace GenericProjectManager;
using namespace GenericProjectManager::Internal; using namespace GenericProjectManager::Internal;
GenericMakeStep::GenericMakeStep(GenericProject *pro, ProjectExplorer::BuildConfiguration *bc) GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildConfiguration *bc)
: AbstractMakeStep(pro, bc), m_pro(pro) : AbstractMakeStep(bc)
{ {
} }
GenericMakeStep::GenericMakeStep(GenericMakeStep *bs, ProjectExplorer::BuildConfiguration *bc) GenericMakeStep::GenericMakeStep(GenericMakeStep *bs, ProjectExplorer::BuildConfiguration *bc)
: AbstractMakeStep(bs, bc), m_pro(bs->project()) : AbstractMakeStep(bs, bc)
{ {
m_buildTargets = bs->m_buildTargets; m_buildTargets = bs->m_buildTargets;
m_makeArguments = bs->m_makeArguments; m_makeArguments = bs->m_makeArguments;
@@ -67,20 +67,21 @@ GenericMakeStep::~GenericMakeStep()
bool GenericMakeStep::init() bool GenericMakeStep::init()
{ {
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
const QString buildParser = m_pro->buildParser(bc); //TODO
GenericProject *pro = static_cast<GenericProject *>(buildConfiguration()->project());
const QString buildParser = pro->buildParser(bc);
setBuildParser(buildParser); setBuildParser(buildParser);
qDebug() << "*** build parser:" << buildParser;
setEnabled(true); setEnabled(true);
Core::VariableManager *vm = Core::VariableManager::instance(); Core::VariableManager *vm = Core::VariableManager::instance();
const QString rawBuildDir = m_pro->buildDirectory(bc); const QString rawBuildDir = buildConfiguration()->project()->buildDirectory(bc);
const QString buildDir = vm->resolve(rawBuildDir); const QString buildDir = vm->resolve(rawBuildDir);
setWorkingDirectory(buildDir); setWorkingDirectory(buildDir);
setCommand(makeCommand()); setCommand(makeCommand());
setArguments(replacedArguments()); setArguments(replacedArguments());
setEnvironment(m_pro->environment(bc)); setEnvironment(buildConfiguration()->project()->environment(bc));
return AbstractMakeStep::init(); return AbstractMakeStep::init();
} }
@@ -119,7 +120,9 @@ QString GenericMakeStep::makeCommand() const
{ {
QString command = m_makeCommand; QString command = m_makeCommand;
if (command.isEmpty()) { if (command.isEmpty()) {
if (ProjectExplorer::ToolChain *toolChain = m_pro->toolChain()) // TODO
GenericProject *pro = static_cast<GenericProject *>(buildConfiguration()->project());
if (ProjectExplorer::ToolChain *toolChain = pro->toolChain())
command = toolChain->makeCommand(); command = toolChain->makeCommand();
else else
command = QLatin1String("make"); command = QLatin1String("make");
@@ -152,11 +155,6 @@ bool GenericMakeStep::immutable() const
return true; return true;
} }
GenericProject *GenericMakeStep::project() const
{
return m_pro;
}
bool GenericMakeStep::buildsTarget(const QString &target) const bool GenericMakeStep::buildsTarget(const QString &target) const
{ {
return m_buildTargets.contains(target); return m_buildTargets.contains(target);
@@ -184,7 +182,8 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
m_ui->setupUi(this); m_ui->setupUi(this);
// TODO update this list also on rescans of the GenericLists.txt // TODO update this list also on rescans of the GenericLists.txt
GenericProject *pro = m_makeStep->project(); //TODO
GenericProject *pro = static_cast<GenericProject *>(m_makeStep->buildConfiguration()->project());
foreach (const QString &target, pro->targets()) { foreach (const QString &target, pro->targets()) {
QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList); QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
@@ -280,14 +279,11 @@ bool GenericMakeStepFactory::canCreate(const QString &name) const
return (Constants::MAKESTEP == name); return (Constants::MAKESTEP == name);
} }
ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Project *project, ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::BuildConfiguration *bc,
ProjectExplorer::BuildConfiguration *bc,
const QString &name) const const QString &name) const
{ {
Q_ASSERT(name == Constants::MAKESTEP); Q_ASSERT(name == Constants::MAKESTEP);
GenericProject *pro = qobject_cast<GenericProject *>(project); return new GenericMakeStep(bc);
Q_ASSERT(pro);
return new GenericMakeStep(pro, bc);
} }
ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::BuildStep *bs,

7
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -56,7 +56,7 @@ class GenericMakeStep : public ProjectExplorer::AbstractMakeStep
Q_OBJECT Q_OBJECT
friend class GenericMakeStepConfigWidget; // TODO remove again? friend class GenericMakeStepConfigWidget; // TODO remove again?
public: public:
GenericMakeStep(GenericProject *pro, ProjectExplorer::BuildConfiguration *bc); GenericMakeStep(ProjectExplorer::BuildConfiguration *bc);
GenericMakeStep(GenericMakeStep *bs, ProjectExplorer::BuildConfiguration *bc); GenericMakeStep(GenericMakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
~GenericMakeStep(); ~GenericMakeStep();
virtual bool init(); virtual bool init();
@@ -67,7 +67,6 @@ public:
virtual QString displayName(); virtual QString displayName();
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
virtual bool immutable() const; virtual bool immutable() const;
GenericProject *project() const;
bool buildsTarget(const QString &target) const; bool buildsTarget(const QString &target) const;
void setBuildTarget(const QString &target, bool on); void setBuildTarget(const QString &target, bool on);
QStringList replacedArguments() const; QStringList replacedArguments() const;
@@ -76,7 +75,6 @@ public:
virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map); virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map);
virtual void storeIntoLocalMap(QMap<QString, QVariant> &map); virtual void storeIntoLocalMap(QMap<QString, QVariant> &map);
private: private:
GenericProject *m_pro;
QStringList m_buildTargets; QStringList m_buildTargets;
QStringList m_makeArguments; QStringList m_makeArguments;
QString m_makeCommand; QString m_makeCommand;
@@ -105,8 +103,7 @@ private:
class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory
{ {
virtual bool canCreate(const QString &name) const; virtual bool canCreate(const QString &name) const;
virtual ProjectExplorer::BuildStep *create(ProjectExplorer::Project *pro, virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc,
ProjectExplorer::BuildConfiguration *bc,
const QString &name) const; const QString &name) const;
virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs,
ProjectExplorer::BuildConfiguration *bc) const; ProjectExplorer::BuildConfiguration *bc) const;

4
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -149,7 +149,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(const QString &type
GenericBuildConfiguration *bc = new GenericBuildConfiguration(m_project, buildConfigurationName); GenericBuildConfiguration *bc = new GenericBuildConfiguration(m_project, buildConfigurationName);
m_project->addBuildConfiguration(bc); // also makes the name unique... m_project->addBuildConfiguration(bc); // also makes the name unique...
GenericMakeStep *makeStep = new GenericMakeStep(m_project, bc); GenericMakeStep *makeStep = new GenericMakeStep(bc);
bc->insertBuildStep(0, makeStep); bc->insertBuildStep(0, makeStep);
makeStep->setBuildTarget("all", /* on = */ true); makeStep->setBuildTarget("all", /* on = */ true);
return bc; return bc;
@@ -536,7 +536,7 @@ bool GenericProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsRead
GenericBuildConfiguration *bc = new GenericBuildConfiguration(this, "all"); GenericBuildConfiguration *bc = new GenericBuildConfiguration(this, "all");
addBuildConfiguration(bc); addBuildConfiguration(bc);
GenericMakeStep *makeStep = new GenericMakeStep(this, bc); GenericMakeStep *makeStep = new GenericMakeStep(bc);
bc->insertBuildStep(0, makeStep); bc->insertBuildStep(0, makeStep);
makeStep->setBuildTarget("all", /* on = */ true); makeStep->setBuildTarget("all", /* on = */ true);

7
src/plugins/projectexplorer/abstractmakestep.cpp
View File

@@ -31,6 +31,7 @@
#include "projectexplorerconstants.h" #include "projectexplorerconstants.h"
#include "project.h" #include "project.h"
#include "buildconfiguration.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -46,8 +47,8 @@ namespace {
bool debug = false; bool debug = false;
} }
AbstractMakeStep::AbstractMakeStep(Project *project, BuildConfiguration *bc) AbstractMakeStep::AbstractMakeStep(BuildConfiguration *bc)
: AbstractProcessStep(project, bc), : AbstractProcessStep(bc),
m_buildParser(0) m_buildParser(0)
{ {
} }
@@ -144,7 +145,7 @@ void AbstractMakeStep::slotAddToTaskWindow(const TaskWindow::Task &task)
if (debug) if (debug)
qDebug() << "No success. Trying all files in project ..."; qDebug() << "No success. Trying all files in project ...";
QString fileName = QFileInfo(filePath).fileName(); QString fileName = QFileInfo(filePath).fileName();
foreach (const QString &file, project()->files(ProjectExplorer::Project::AllFiles)) { foreach (const QString &file, buildConfiguration()->project()->files(ProjectExplorer::Project::AllFiles)) {
QFileInfo candidate(file); QFileInfo candidate(file);
if (candidate.fileName() == fileName) { if (candidate.fileName() == fileName) {
if (debug) if (debug)

2
src/plugins/projectexplorer/abstractmakestep.h
View File

@@ -46,7 +46,7 @@ class PROJECTEXPLORER_EXPORT AbstractMakeStep : public ProjectExplorer::Abstract
{ {
Q_OBJECT Q_OBJECT
public: public:
AbstractMakeStep(Project * project, BuildConfiguration *bc); AbstractMakeStep(BuildConfiguration *bc);
AbstractMakeStep(AbstractMakeStep *bs, BuildConfiguration *bc); AbstractMakeStep(AbstractMakeStep *bs, BuildConfiguration *bc);
~AbstractMakeStep(); ~AbstractMakeStep();
virtual bool init(); virtual bool init();

4
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -39,8 +39,8 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
AbstractProcessStep::AbstractProcessStep(Project *pro, BuildConfiguration *bc) AbstractProcessStep::AbstractProcessStep(BuildConfiguration *bc)
: BuildStep(pro, bc), m_timer(0), m_futureInterface(0), m_process(0), m_eventLoop(0) : BuildStep(bc), m_timer(0), m_futureInterface(0), m_process(0), m_eventLoop(0)
{ {
} }

2
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -65,7 +65,7 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
{ {
Q_OBJECT Q_OBJECT
public: public:
AbstractProcessStep(Project *pro, BuildConfiguration *bc); AbstractProcessStep(BuildConfiguration *bc);
AbstractProcessStep(AbstractProcessStep *bs, BuildConfiguration *bc); AbstractProcessStep(AbstractProcessStep *bs, BuildConfiguration *bc);
/// reimplemented from BuildStep::init() /// reimplemented from BuildStep::init()
/// You need to call this from YourBuildStep::init() /// You need to call this from YourBuildStep::init()

22
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -136,7 +136,7 @@ void BuildManager::cancel()
this, SLOT(addToTaskWindow(ProjectExplorer::TaskWindow::Task))); this, SLOT(addToTaskWindow(ProjectExplorer::TaskWindow::Task)));
disconnect(m_currentBuildStep, SIGNAL(addToOutputWindow(QString)), disconnect(m_currentBuildStep, SIGNAL(addToOutputWindow(QString)),
this, SLOT(addToOutputWindow(QString))); this, SLOT(addToOutputWindow(QString)));
decrementActiveBuildSteps(m_currentBuildStep->project()); decrementActiveBuildSteps(m_currentBuildStep->buildConfiguration()->project());
m_progressFutureInterface->setProgressValueAndText(m_progress*100, "Build canceled"); //TODO NBS fix in qtconcurrent m_progressFutureInterface->setProgressValueAndText(m_progress*100, "Build canceled"); //TODO NBS fix in qtconcurrent
clearBuildQueue(); clearBuildQueue();
@@ -169,7 +169,7 @@ void BuildManager::emitCancelMessage()
void BuildManager::clearBuildQueue() void BuildManager::clearBuildQueue()
{ {
foreach (BuildStep * bs, m_buildQueue) foreach (BuildStep * bs, m_buildQueue)
decrementActiveBuildSteps(bs->project()); decrementActiveBuildSteps(bs->buildConfiguration()->project());
m_buildQueue.clear(); m_buildQueue.clear();
m_running = false; m_running = false;
@@ -280,13 +280,14 @@ void BuildManager::nextBuildQueue()
bool result = m_watcher.result(); bool result = m_watcher.result();
if (!result) { if (!result) {
// Build Failure // Build Failure
addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1</font>").arg(m_currentBuildStep->project()->name())); const QString projectName = m_currentBuildStep->buildConfiguration()->project()->name();
addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1</font>").arg(projectName));
addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(m_currentBuildStep->displayName())); addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(m_currentBuildStep->displayName()));
// NBS TODO fix in qtconcurrent // NBS TODO fix in qtconcurrent
m_progressFutureInterface->setProgressValueAndText(m_progress*100, tr("Error while building project %1").arg(m_currentBuildStep->project()->name())); m_progressFutureInterface->setProgressValueAndText(m_progress*100, tr("Error while building project %1").arg(projectName));
} }
decrementActiveBuildSteps(m_currentBuildStep->project()); decrementActiveBuildSteps(m_currentBuildStep->buildConfiguration()->project());
if (result) if (result)
nextStep(); nextStep();
else else
@@ -317,17 +318,18 @@ void BuildManager::nextStep()
bool init = m_currentBuildStep->init(); bool init = m_currentBuildStep->init();
if (!init) { if (!init) {
addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1</font>").arg(m_currentBuildStep->project()->name())); const QString projectName = m_currentBuildStep->buildConfiguration()->project()->name();
addToOutputWindow(tr("<font color=\"#ff0000\">Error while building project %1</font>").arg(projectName));
addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(m_currentBuildStep->displayName())); addToOutputWindow(tr("<font color=\"#ff0000\">When executing build step '%1'</font>").arg(m_currentBuildStep->displayName()));
cancel(); cancel();
return; return;
} }
if (m_currentBuildStep->project() != m_previousBuildStepProject) { if (m_currentBuildStep->buildConfiguration()->project() != m_previousBuildStepProject) {
const QString projectName = m_currentBuildStep->project()->name(); const QString projectName = m_currentBuildStep->buildConfiguration()->project()->name();
addToOutputWindow(tr("<b>Running build steps for project %2...</b>") addToOutputWindow(tr("<b>Running build steps for project %2...</b>")
.arg(projectName)); .arg(projectName));
m_previousBuildStepProject = m_currentBuildStep->project(); m_previousBuildStepProject = m_currentBuildStep->buildConfiguration()->project();
} }
m_watcher.setFuture(QtConcurrent::run(&BuildStep::run, m_currentBuildStep)); m_watcher.setFuture(QtConcurrent::run(&BuildStep::run, m_currentBuildStep));
} else { } else {
@@ -346,7 +348,7 @@ void BuildManager::buildQueueAppend(BuildStep * bs)
{ {
m_buildQueue.append(bs); m_buildQueue.append(bs);
++m_maxProgress; ++m_maxProgress;
incrementActiveBuildSteps(bs->project()); incrementActiveBuildSteps(bs->buildConfiguration()->project());
} }
void BuildManager::buildProjects(const QList<Project *> &projects, const QList<QString> &configurations) void BuildManager::buildProjects(const QList<Project *> &projects, const QList<QString> &configurations)

11
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -36,13 +36,13 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
BuildStep::BuildStep(Project * pro, BuildConfiguration *bc) BuildStep::BuildStep(BuildConfiguration *bc)
: m_project(pro), m_buildConfiguration(bc) : m_buildConfiguration(bc)
{ {
} }
BuildStep::BuildStep(BuildStep *bs, BuildConfiguration *bc) BuildStep::BuildStep(BuildStep *bs, BuildConfiguration *bc)
: m_project(bs->m_project), m_buildConfiguration(bc) : m_buildConfiguration(bc)
{ {
} }
@@ -68,11 +68,6 @@ void BuildStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
Q_UNUSED(map) Q_UNUSED(map)
} }
Project *BuildStep::project() const
{
return m_project;
}
BuildConfiguration *BuildStep::buildConfiguration() const BuildConfiguration *BuildStep::buildConfiguration() const
{ {
return m_buildConfiguration; return m_buildConfiguration;

9
src/plugins/projectexplorer/buildstep.h
View File

@@ -37,7 +37,7 @@
#include <QtCore/QFutureInterface> #include <QtCore/QFutureInterface>
namespace ProjectExplorer { namespace ProjectExplorer {
// TODO remove this
class Project; class Project;
class BuildConfiguration; class BuildConfiguration;
@@ -71,9 +71,8 @@ class BuildStepConfigWidget;
class PROJECTEXPLORER_EXPORT BuildStep : public QObject class PROJECTEXPLORER_EXPORT BuildStep : public QObject
{ {
Q_OBJECT Q_OBJECT
friend class Project; //for managing BuildConfigurations
protected: protected:
BuildStep(Project *p, BuildConfiguration *bc); BuildStep(BuildConfiguration *bc);
BuildStep(BuildStep *bs, BuildConfiguration *bc); BuildStep(BuildStep *bs, BuildConfiguration *bc);
public: public:
@@ -110,7 +109,6 @@ public:
virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map); virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map);
virtual void storeIntoLocalMap(QMap<QString, QVariant> &map); virtual void storeIntoLocalMap(QMap<QString, QVariant> &map);
Project *project() const;
BuildConfiguration *buildConfiguration() const; BuildConfiguration *buildConfiguration() const;
Q_SIGNALS: Q_SIGNALS:
@@ -120,7 +118,6 @@ Q_SIGNALS:
void addToOutputWindow(const QString &string); void addToOutputWindow(const QString &string);
private: private:
Project *m_project;
BuildConfiguration *m_buildConfiguration; BuildConfiguration *m_buildConfiguration;
}; };
@@ -135,7 +132,7 @@ public:
/// Called to check wheter this factory can restore the named BuildStep /// Called to check wheter this factory can restore the named BuildStep
virtual bool canCreate(const QString &name) const = 0; virtual bool canCreate(const QString &name) const = 0;
/// Called to restore a buildstep /// Called to restore a buildstep
virtual BuildStep *create(Project *pro, BuildConfiguration *bc, const QString &name) const = 0; virtual BuildStep *create(BuildConfiguration *bc, const QString &name) const = 0;
/// Called by the add BuildStep action to check which BuildSteps could be added /// Called by the add BuildStep action to check which BuildSteps could be added
/// to the project by this factory, should return a list of names /// to the project by this factory, should return a list of names
virtual QStringList canCreateForProject(Project *pro) const = 0; virtual QStringList canCreateForProject(Project *pro) const = 0;

2
src/plugins/projectexplorer/buildstepspage.cpp
View File

@@ -216,7 +216,7 @@ void BuildStepsPage::addBuildStep()
if (QAction *action = qobject_cast<QAction *>(sender())) { if (QAction *action = qobject_cast<QAction *>(sender())) {
BuildConfiguration *bc = m_pro->buildConfiguration(m_configuration); BuildConfiguration *bc = m_pro->buildConfiguration(m_configuration);
QPair<QString, IBuildStepFactory *> pair = m_addBuildStepHash.value(action); QPair<QString, IBuildStepFactory *> pair = m_addBuildStepHash.value(action);
BuildStep *newStep = pair.second->create(m_pro, bc, pair.first); BuildStep *newStep = pair.second->create(bc, pair.first);
int pos = m_clean ? bc->cleanSteps().count() : bc->buildSteps().count(); int pos = m_clean ? bc->cleanSteps().count() : bc->buildSteps().count();
m_clean ? bc->insertCleanStep(pos, newStep) : bc->insertBuildStep(pos, newStep); m_clean ? bc->insertCleanStep(pos, newStep) : bc->insertBuildStep(pos, newStep);

13
src/plugins/projectexplorer/processstep.cpp
View File

@@ -30,6 +30,7 @@
#include "processstep.h" #include "processstep.h"
#include "buildstep.h" #include "buildstep.h"
#include "project.h" #include "project.h"
#include "buildconfiguration.h"
#include <coreplugin/ifile.h> #include <coreplugin/ifile.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -45,8 +46,8 @@ static const char * const PROCESS_WORKINGDIRECTORY = "abstractProcess.workingDir
static const char * const PROCESS_ARGUMENTS = "abstractProcess.arguments"; static const char * const PROCESS_ARGUMENTS = "abstractProcess.arguments";
static const char * const PROCESS_ENABLED = "abstractProcess.enabled"; static const char * const PROCESS_ENABLED = "abstractProcess.enabled";
ProcessStep::ProcessStep(Project *pro, BuildConfiguration *bc) ProcessStep::ProcessStep(BuildConfiguration *bc)
: AbstractProcessStep(pro, bc) : AbstractProcessStep(bc)
{ {
} }
@@ -64,12 +65,12 @@ ProcessStep::ProcessStep(ProcessStep *bs, BuildConfiguration *bc)
bool ProcessStep::init() bool ProcessStep::init()
{ {
setEnvironment(project()->environment(buildConfiguration())); setEnvironment(buildConfiguration()->project()->environment(buildConfiguration()));
QString wd = workingDirectory(); QString wd = workingDirectory();
if (wd.isEmpty()) if (wd.isEmpty())
wd = "$BUILDDIR"; wd = "$BUILDDIR";
AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", project()->buildDirectory(buildConfiguration()))); AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", buildConfiguration()->project()->buildDirectory(buildConfiguration())));
AbstractProcessStep::setCommand(m_command); AbstractProcessStep::setCommand(m_command);
AbstractProcessStep::setEnabled(m_enabled); AbstractProcessStep::setEnabled(m_enabled);
AbstractProcessStep::setArguments(m_arguments); AbstractProcessStep::setArguments(m_arguments);
@@ -200,10 +201,10 @@ bool ProcessStepFactory::canCreate(const QString &name) const
return name == "projectexplorer.processstep"; return name == "projectexplorer.processstep";
} }
BuildStep *ProcessStepFactory::create(Project *pro, BuildConfiguration *bc, const QString &name) const BuildStep *ProcessStepFactory::create(BuildConfiguration *bc, const QString &name) const
{ {
Q_UNUSED(name) Q_UNUSED(name)
return new ProcessStep(pro, bc); return new ProcessStep(bc);
} }
BuildStep *ProcessStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const BuildStep *ProcessStepFactory::clone(BuildStep *bs, BuildConfiguration *bc) const

4
src/plugins/projectexplorer/processstep.h
View File

@@ -45,7 +45,7 @@ class ProcessStepFactory : public IBuildStepFactory
public: public:
ProcessStepFactory(); ProcessStepFactory();
virtual bool canCreate(const QString &name) const; virtual bool canCreate(const QString &name) const;
virtual BuildStep *create(Project *pro, BuildConfiguration *bc, const QString &name) const; virtual BuildStep *create(BuildConfiguration *bc, const QString &name) const;
virtual BuildStep *clone(BuildStep *bs, BuildConfiguration *bc) const; virtual BuildStep *clone(BuildStep *bs, BuildConfiguration *bc) const;
virtual QStringList canCreateForProject(Project *pro) const; virtual QStringList canCreateForProject(Project *pro) const;
virtual QString displayNameForName(const QString &name) const; virtual QString displayNameForName(const QString &name) const;
@@ -55,7 +55,7 @@ class ProcessStep : public ProjectExplorer::AbstractProcessStep
{ {
Q_OBJECT Q_OBJECT
public: public:
ProcessStep(Project *pro, BuildConfiguration *bc); ProcessStep(BuildConfiguration *bc);
ProcessStep(ProcessStep *bs, BuildConfiguration *bc); ProcessStep(ProcessStep *bs, BuildConfiguration *bc);
virtual bool init(); virtual bool init();
virtual void run(QFutureInterface<bool> &); virtual void run(QFutureInterface<bool> &);

8
src/plugins/projectexplorer/project.cpp
View File

@@ -238,7 +238,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
BuildStep *buildStep = 0; BuildStep *buildStep = 0;
foreach (IBuildStepFactory *factory, buildStepFactories) { foreach (IBuildStepFactory *factory, buildStepFactories) {
if (factory->canCreate(buildStepName)) { if (factory->canCreate(buildStepName)) {
buildStep = factory->create(this, bc, buildStepName); buildStep = factory->create(bc, buildStepName);
break; break;
} }
} }
@@ -265,7 +265,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
BuildStep *cleanStep = 0; BuildStep *cleanStep = 0;
foreach (IBuildStepFactory *factory, buildStepFactories) { foreach (IBuildStepFactory *factory, buildStepFactories) {
if (factory->canCreate(cleanStepName)) { if (factory->canCreate(cleanStepName)) {
cleanStep = factory->create(this, bc, cleanStepName); cleanStep = factory->create(bc, cleanStepName);
break; break;
} }
} }
@@ -303,7 +303,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
} }
if (factory) { if (factory) {
foreach(BuildConfiguration *bc, buildConfigurations()) { foreach(BuildConfiguration *bc, buildConfigurations()) {
buildStep = factory->create(this, bc, buildStepName); buildStep = factory->create(bc, buildStepName);
bc->insertBuildStep(pos, buildStep); bc->insertBuildStep(pos, buildStep);
QMap<QString, QVariant> buildStepValues = reader.restoreValue("buildstep" + QString().setNum(buildstepnr)).toMap(); QMap<QString, QVariant> buildStepValues = reader.restoreValue("buildstep" + QString().setNum(buildstepnr)).toMap();
buildStep->restoreFromGlobalMap(buildStepValues); buildStep->restoreFromGlobalMap(buildStepValues);
@@ -335,7 +335,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
if (factory) { if (factory) {
foreach(BuildConfiguration *bc, buildConfigurations()) { foreach(BuildConfiguration *bc, buildConfigurations()) {
cleanStep = factory->create(this, bc, cleanStepName); cleanStep = factory->create(bc, cleanStepName);
bc->insertCleanStep(pos, cleanStep); bc->insertCleanStep(pos, cleanStep);
QMap<QString, QVariant> cleanStepValues = reader.restoreValue("cleanstep" + QString().setNum(cleanstepnr)).toMap(); QMap<QString, QVariant> cleanStepValues = reader.restoreValue("cleanstep" + QString().setNum(cleanstepnr)).toMap();
cleanStep->restoreFromGlobalMap(cleanStepValues); cleanStep->restoreFromGlobalMap(cleanStepValues);

21
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -44,8 +44,8 @@ using ExtensionSystem::PluginManager;
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
MakeStep::MakeStep(Qt4Project * project, ProjectExplorer::BuildConfiguration *bc) MakeStep::MakeStep(ProjectExplorer::BuildConfiguration *bc)
: AbstractMakeStep(project, bc), m_clean(false) : AbstractMakeStep(bc), m_clean(false)
{ {
} }
@@ -97,10 +97,11 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
bool MakeStep::init() bool MakeStep::init()
{ {
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
Environment environment = project()->environment(bc); Environment environment = buildConfiguration()->project()->environment(bc);
setEnvironment(environment); setEnvironment(environment);
Qt4Project *qt4project = qobject_cast<Qt4Project *>(project()); //TODO
Qt4Project *qt4project = static_cast<Qt4Project *>(buildConfiguration()->project());
QString workingDirectory = qt4project->buildDirectory(bc); QString workingDirectory = qt4project->buildDirectory(bc);
setWorkingDirectory(workingDirectory); setWorkingDirectory(workingDirectory);
@@ -163,7 +164,7 @@ bool MakeStep::init()
void MakeStep::run(QFutureInterface<bool> & fi) void MakeStep::run(QFutureInterface<bool> & fi)
{ {
if (qobject_cast<Qt4Project *>(project())->rootProjectNode()->projectType() == ScriptTemplate) { if (static_cast<Qt4Project *>(buildConfiguration()->project())->rootProjectNode()->projectType() == ScriptTemplate) {
fi.reportResult(true); fi.reportResult(true);
return; return;
} }
@@ -213,7 +214,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
connect(makeStep, SIGNAL(changed()), connect(makeStep, SIGNAL(changed()),
this, SLOT(update())); this, SLOT(update()));
connect(makeStep->project(), SIGNAL(buildDirectoryChanged()), connect(makeStep->buildConfiguration()->project(), SIGNAL(buildDirectoryChanged()),
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()), connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
@@ -224,14 +225,14 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
void MakeStepConfigWidget::updateMakeOverrideLabel() void MakeStepConfigWidget::updateMakeOverrideLabel()
{ {
Qt4Project *qt4project = qobject_cast<Qt4Project *>(m_makeStep->project()); Qt4Project *qt4project = static_cast<Qt4Project *>(m_makeStep->buildConfiguration()->project());
m_ui.makeLabel->setText(tr("Override %1:").arg(qt4project-> m_ui.makeLabel->setText(tr("Override %1:").arg(qt4project->
makeCommand(m_makeStep->buildConfiguration()))); makeCommand(m_makeStep->buildConfiguration())));
} }
void MakeStepConfigWidget::updateDetails() void MakeStepConfigWidget::updateDetails()
{ {
Qt4Project *pro = static_cast<Qt4Project *>(m_makeStep->project()); Qt4Project *pro = static_cast<Qt4Project *>(m_makeStep->buildConfiguration()->project());
ProjectExplorer::BuildConfiguration *bc = m_makeStep->buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = m_makeStep->buildConfiguration();
QString workingDirectory = pro->buildDirectory(bc); QString workingDirectory = pro->buildDirectory(bc);
@@ -325,10 +326,10 @@ bool MakeStepFactory::canCreate(const QString & name) const
return (name == Constants::MAKESTEP); return (name == Constants::MAKESTEP);
} }
ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::Project *pro, ProjectExplorer::BuildConfiguration *bc, const QString & name) const ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const
{ {
Q_UNUSED(name) Q_UNUSED(name)
return new MakeStep(static_cast<Qt4Project *>(pro), bc); return new MakeStep(bc);
} }
ProjectExplorer::BuildStep *MakeStepFactory::clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const ProjectExplorer::BuildStep *MakeStepFactory::clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const

4
src/plugins/qt4projectmanager/makestep.h
View File

@@ -52,7 +52,7 @@ public:
MakeStepFactory(); MakeStepFactory();
virtual ~MakeStepFactory(); virtual ~MakeStepFactory();
bool canCreate(const QString & name) const; bool canCreate(const QString & name) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::Project * pro, ProjectExplorer::BuildConfiguration *bc, const QString & name) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
QStringList canCreateForProject(ProjectExplorer::Project *pro) const; QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
QString displayNameForName(const QString &name) const; QString displayNameForName(const QString &name) const;
@@ -67,7 +67,7 @@ class MakeStep : public ProjectExplorer::AbstractMakeStep
friend class MakeStepConfigWidget; // TODO remove this friend class MakeStepConfigWidget; // TODO remove this
// used to access internal stuff // used to access internal stuff
public: public:
MakeStep(Qt4Project * project, ProjectExplorer::BuildConfiguration *bc); MakeStep(ProjectExplorer::BuildConfiguration *bc);
MakeStep(MakeStep *bs, ProjectExplorer::BuildConfiguration *bc); MakeStep(MakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
~MakeStep(); ~MakeStep();
virtual bool init(); virtual bool init();

48
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -49,14 +49,13 @@ using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
QMakeStep::QMakeStep(Qt4Project *project, ProjectExplorer::BuildConfiguration *bc) QMakeStep::QMakeStep(ProjectExplorer::BuildConfiguration *bc)
: AbstractMakeStep(project, bc), m_pro(project), m_forced(false) : AbstractMakeStep(bc), m_forced(false)
{ {
} }
QMakeStep::QMakeStep(QMakeStep *bs, ProjectExplorer::BuildConfiguration *bc) QMakeStep::QMakeStep(QMakeStep *bs, ProjectExplorer::BuildConfiguration *bc)
: AbstractMakeStep(bs, bc), : AbstractMakeStep(bs, bc),
m_pro(bs->m_pro),
m_forced(false), m_forced(false),
m_qmakeArgs(bs->m_qmakeArgs) m_qmakeArgs(bs->m_qmakeArgs)
{ {
@@ -72,21 +71,23 @@ QStringList QMakeStep::arguments()
QStringList additonalArguments = m_qmakeArgs; QStringList additonalArguments = m_qmakeArgs;
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
QStringList arguments; QStringList arguments;
arguments << project()->file()->fileName(); arguments << buildConfiguration()->project()->file()->fileName();
arguments << "-r"; arguments << "-r";
// TODO
Qt4Project *pro = static_cast<Qt4Project *>(buildConfiguration()->project());
if (!additonalArguments.contains("-spec")) if (!additonalArguments.contains("-spec"))
arguments << "-spec" << m_pro->qtVersion(bc)->mkspec(); arguments << "-spec" << pro->qtVersion(bc)->mkspec();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
ToolChain::ToolChainType type = m_pro->toolChainType(bc); ToolChain::ToolChainType type = pro->toolChainType(bc);
if (type == ToolChain::GCC_MAEMO) if (type == ToolChain::GCC_MAEMO)
arguments << QLatin1String("-unix"); arguments << QLatin1String("-unix");
#endif #endif
if (bc->value("buildConfiguration").isValid()) { if (bc->value("buildConfiguration").isValid()) {
QStringList configarguments; QStringList configarguments;
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = m_pro->qtVersion(bc)->defaultBuildConfig(); QtVersion::QmakeBuildConfigs defaultBuildConfiguration = pro->qtVersion(bc)->defaultBuildConfig();
QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(bc->value("buildConfiguration").toInt()); QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(bc->value("buildConfiguration").toInt());
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll)) if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))
configarguments << "CONFIG-=debug_and_release"; configarguments << "CONFIG-=debug_and_release";
@@ -111,7 +112,9 @@ QStringList QMakeStep::arguments()
bool QMakeStep::init() bool QMakeStep::init()
{ {
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
const QtVersion *qtVersion = m_pro->qtVersion(bc); // TODO
Qt4Project *pro = static_cast<Qt4Project *>(buildConfiguration()->project());
const QtVersion *qtVersion = pro->qtVersion(bc);
if (!qtVersion->isValid()) { if (!qtVersion->isValid()) {
#if defined(Q_WS_MAC) #if defined(Q_WS_MAC)
@@ -123,7 +126,7 @@ bool QMakeStep::init()
} }
QStringList args = arguments(); QStringList args = arguments();
QString workingDirectory = m_pro->buildDirectory(bc); QString workingDirectory = pro->buildDirectory(bc);
QString program = qtVersion->qmakeCommand(); QString program = qtVersion->qmakeCommand();
@@ -132,7 +135,7 @@ bool QMakeStep::init()
if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) { if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory); QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
if (qtVersion->qmakeCommand() == qmakePath) { if (qtVersion->qmakeCommand() == qmakePath) {
m_needToRunQMake = !m_pro->compareBuildConfigurationToImportFrom(bc, workingDirectory); m_needToRunQMake = !pro->compareBuildConfigurationToImportFrom(bc, workingDirectory);
} }
} }
@@ -145,7 +148,7 @@ bool QMakeStep::init()
setWorkingDirectory(workingDirectory); setWorkingDirectory(workingDirectory);
setCommand(program); setCommand(program);
setArguments(args); setArguments(args);
setEnvironment(m_pro->environment(bc)); setEnvironment(pro->environment(bc));
setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_QMAKE); setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_QMAKE);
return AbstractMakeStep::init(); return AbstractMakeStep::init();
@@ -153,7 +156,9 @@ bool QMakeStep::init()
void QMakeStep::run(QFutureInterface<bool> &fi) void QMakeStep::run(QFutureInterface<bool> &fi)
{ {
if (qobject_cast<Qt4Project *>(project())->rootProjectNode()->projectType() == ScriptTemplate) { //TODO
Qt4Project *pro = static_cast<Qt4Project *>(buildConfiguration()->project());
if (pro->rootProjectNode()->projectType() == ScriptTemplate) {
fi.reportResult(true); fi.reportResult(true);
return; return;
} }
@@ -242,7 +247,7 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationChanged())); connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationChanged()));
connect(step, SIGNAL(changed()), connect(step, SIGNAL(changed()),
this, SLOT(update())); this, SLOT(update()));
connect(step->project(), SIGNAL(qtVersionChanged(ProjectExplorer::BuildConfiguration *)), connect(step->buildConfiguration()->project(), SIGNAL(qtVersionChanged(ProjectExplorer::BuildConfiguration *)),
this, SLOT(qtVersionChanged(ProjectExplorer::BuildConfiguration *))); this, SLOT(qtVersionChanged(ProjectExplorer::BuildConfiguration *)));
} }
@@ -261,7 +266,7 @@ void QMakeStepConfigWidget::qtVersionChanged(ProjectExplorer::BuildConfiguration
void QMakeStepConfigWidget::updateTitleLabel() void QMakeStepConfigWidget::updateTitleLabel()
{ {
Qt4Project *qt4project = qobject_cast<Qt4Project *>(m_step->project()); Qt4Project *qt4project = static_cast<Qt4Project *>(m_step->buildConfiguration()->project());
const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration()); const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration());
if (!qtVersion) { if (!qtVersion) {
m_summaryText = tr("<b>QMake:</b> No Qt version set. QMake can not be run."); m_summaryText = tr("<b>QMake:</b> No Qt version set. QMake can not be run.");
@@ -271,9 +276,10 @@ void QMakeStepConfigWidget::updateTitleLabel()
QStringList args = m_step->arguments(); QStringList args = m_step->arguments();
// We don't want the full path to the .pro file // We don't want the full path to the .pro file
int index = args.indexOf(m_step->project()->file()->fileName()); const QString projectFileName = m_step->buildConfiguration()->project()->file()->fileName();
int index = args.indexOf(projectFileName);
if (index != -1) if (index != -1)
args[index] = QFileInfo(m_step->project()->file()->fileName()).fileName(); args[index] = QFileInfo(projectFileName).fileName();
// And we only use the .pro filename not the full path // And we only use the .pro filename not the full path
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName(); QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
@@ -287,7 +293,7 @@ void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited()
m_step->setQMakeArguments( m_step->setQMakeArguments(
ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text())); ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text()));
static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation(); static_cast<Qt4Project *>(m_step->buildConfiguration()->project())->invalidateCachedTargetInformation();
updateTitleLabel(); updateTitleLabel();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();
} }
@@ -303,7 +309,7 @@ void QMakeStepConfigWidget::buildConfigurationChanged()
buildConfiguration = buildConfiguration & ~QtVersion::DebugBuild; buildConfiguration = buildConfiguration & ~QtVersion::DebugBuild;
} }
bc->setValue("buildConfiguration", int(buildConfiguration)); bc->setValue("buildConfiguration", int(buildConfiguration));
static_cast<Qt4Project *>(m_step->project())->invalidateCachedTargetInformation(); static_cast<Qt4Project *>(m_step->buildConfiguration()->project())->invalidateCachedTargetInformation();
updateTitleLabel(); updateTitleLabel();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();
// TODO if exact parsing is the default, we need to update the code model // TODO if exact parsing is the default, we need to update the code model
@@ -334,7 +340,7 @@ void QMakeStepConfigWidget::init()
void QMakeStepConfigWidget::updateEffectiveQMakeCall() void QMakeStepConfigWidget::updateEffectiveQMakeCall()
{ {
Qt4Project *qt4project = qobject_cast<Qt4Project *>(m_step->project()); Qt4Project *qt4project = static_cast<Qt4Project *>(m_step->buildConfiguration()->project());
const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration()); const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration());
if (qtVersion) { if (qtVersion) {
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName(); QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
@@ -361,10 +367,10 @@ bool QMakeStepFactory::canCreate(const QString & name) const
return (name == Constants::QMAKESTEP); return (name == Constants::QMAKESTEP);
} }
ProjectExplorer::BuildStep *QMakeStepFactory::create(ProjectExplorer::Project * pro, BuildConfiguration *bc, const QString & name) const ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildConfiguration *bc, const QString & name) const
{ {
Q_UNUSED(name) Q_UNUSED(name)
return new QMakeStep(static_cast<Qt4Project *>(pro), bc); return new QMakeStep(bc);
} }
ProjectExplorer::BuildStep *QMakeStepFactory::clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const ProjectExplorer::BuildStep *QMakeStepFactory::clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const

5
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -52,7 +52,7 @@ public:
QMakeStepFactory(); QMakeStepFactory();
virtual ~QMakeStepFactory(); virtual ~QMakeStepFactory();
bool canCreate(const QString & name) const; bool canCreate(const QString & name) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::Project * pro, ProjectExplorer::BuildConfiguration *bc, const QString & name) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildConfiguration *bc, const QString & name) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStep *bs, ProjectExplorer::BuildConfiguration *bc) const;
QStringList canCreateForProject(ProjectExplorer::Project *pro) const; QStringList canCreateForProject(ProjectExplorer::Project *pro) const;
QString displayNameForName(const QString &name) const; QString displayNameForName(const QString &name) const;
@@ -68,7 +68,7 @@ class QMakeStep : public ProjectExplorer::AbstractMakeStep
friend class Qt4Project; // TODO remove friend class Qt4Project; // TODO remove
// Currently used to access qmakeArgs // Currently used to access qmakeArgs
public: public:
QMakeStep(Qt4Project * project, ProjectExplorer::BuildConfiguration *bc); QMakeStep(ProjectExplorer::BuildConfiguration *bc);
QMakeStep(QMakeStep *bs, ProjectExplorer::BuildConfiguration *bc); QMakeStep(QMakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
~QMakeStep(); ~QMakeStep();
virtual bool init(); virtual bool init();
@@ -95,7 +95,6 @@ protected:
virtual bool processFinished(int exitCode, QProcess::ExitStatus status); virtual bool processFinished(int exitCode, QProcess::ExitStatus status);
private: private:
Qt4Project *m_pro;
// last values // last values
QStringList m_lastEnv; QStringList m_lastEnv;
bool m_forced; bool m_forced;

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -462,13 +462,13 @@ Qt4BuildConfiguration *Qt4Project::addQt4BuildConfiguration(QString buildConfigu
Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(this, buildConfigurationName); Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(this, buildConfigurationName);
addBuildConfiguration(bc); addBuildConfiguration(bc);
QMakeStep *qmakeStep = new QMakeStep(this, bc); QMakeStep *qmakeStep = new QMakeStep(bc);
bc->insertBuildStep(0, qmakeStep); bc->insertBuildStep(0, qmakeStep);
MakeStep *makeStep = new MakeStep(this, bc); MakeStep *makeStep = new MakeStep(bc);
bc->insertBuildStep(1, makeStep); bc->insertBuildStep(1, makeStep);
MakeStep* cleanStep = new MakeStep(this, bc); MakeStep* cleanStep = new MakeStep(bc);
cleanStep->setClean(true); cleanStep->setClean(true);
bc->insertCleanStep(0, cleanStep); bc->insertCleanStep(0, cleanStep);
if (!additionalArguments.isEmpty()) if (!additionalArguments.isEmpty())