diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-07-16 14:00:41 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-08-02 14:21:05 +0200 |
commit | ee4a04a20b2af6d6ffb5f8b1d938d18ca21ef157 (patch) | |
tree | 5f5e905180d2f80865c7adbc46e6767fb18de408 /src/plugins/projectexplorer/buildmanager.cpp | |
parent | cc93a08b1b3605f05a61e47c0e5a4aeb5dbdf913 (diff) | |
download | qt-creator-ee4a04a20b2af6d6ffb5f8b1d938d18ca21ef157.tar.gz |
Refactor deployment
* Add a DeployConfiguration class to hold settings related
to deployment.
* Add BuildStepsList to hold a list of buildsteps
* Update BuildConfiguration to use BuildStepLists instead of
manageing lists of buildsteps itself.
* Update BuildManager to use BuildStepLists in its interfaces
* Fix fallout introduced by API changes
* Update .user file to new way of storing settings
Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
Diffstat (limited to 'src/plugins/projectexplorer/buildmanager.cpp')
-rw-r--r-- | src/plugins/projectexplorer/buildmanager.cpp | 57 |
1 files changed, 6 insertions, 51 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 3b18945b1a..2236755c4c 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -31,6 +31,7 @@ #include "buildprogress.h" #include "buildstep.h" +#include "buildsteplist.h" #include "compileoutputwindow.h" #include "projectexplorerconstants.h" #include "projectexplorer.h" @@ -409,47 +410,16 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps) return true; } -bool BuildManager::buildProjects(const QList<BuildConfiguration *> &configurations) +bool BuildManager::buildList(BuildStepList *bsl) { - QList<BuildStep *> steps; - foreach(BuildConfiguration *bc, configurations) - steps.append(bc->steps(BuildStep::Build)); - - bool success = buildQueueAppend(steps); - if (!success) { - m_outputWindow->popup(false); - return false; - } - - if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput) - m_outputWindow->popup(false); - startBuildQueue(); - return true; -} - -bool BuildManager::deployProjects(const QList<BuildConfiguration *> &configurations) -{ - QList<BuildStep *> steps; - foreach(BuildConfiguration *bc, configurations) - steps.append(bc->steps(BuildStep::Deploy)); - - bool success = buildQueueAppend(steps); - if (!success) { - m_outputWindow->popup(false); - return false; - } - - if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput) - m_outputWindow->popup(false); - startBuildQueue(); - return true; + return buildLists(QList<BuildStepList *>() << bsl); } -bool BuildManager::cleanProjects(const QList<BuildConfiguration *> &configurations) +bool BuildManager::buildLists(QList<BuildStepList *> bsls) { QList<BuildStep *> steps; - foreach(BuildConfiguration *bc, configurations) - steps.append(bc->steps(BuildStep::Clean)); + foreach(BuildStepList *list, bsls) + steps.append(list->steps()); bool success = buildQueueAppend(steps); if (!success) { @@ -463,21 +433,6 @@ bool BuildManager::cleanProjects(const QList<BuildConfiguration *> &configuratio return true; } -bool BuildManager::buildProject(BuildConfiguration *configuration) -{ - return buildProjects(QList<BuildConfiguration *>() << configuration); -} - -bool BuildManager::deployProject(BuildConfiguration *configuration) -{ - return deployProjects(QList<BuildConfiguration *>() << configuration); -} - -bool BuildManager::cleanProject(BuildConfiguration *configuration) -{ - return cleanProjects(QList<BuildConfiguration *>() << configuration); -} - void BuildManager::appendStep(BuildStep *step) { bool success = buildQueueAppend(QList<BuildStep *>() << step); |