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

ProjectExplorer: Let users build all projects

Browse Source 
... in all configurations.

Fixes: QTCREATORBUG-16815
Change-Id: I3a6bc3c0661b8c1c42fe8e58ab31152a90f45f6c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-01-22 15:39:20 +01:00
parent 12184b9546
commit eea2ff5f79
3 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,20 +324,21 @@ void BuildManager::rebuildProjectWithDependencies(Project *project, ConfigSelect
configSelection); configSelection);
} }
void BuildManager::buildProjects(const QList<Project *> &projects) void BuildManager::buildProjects(const QList<Project *> &projects, ConfigSelection configSelection)
{ {
queue(projects, {Id(Constants::BUILDSTEPS_BUILD)}, ConfigSelection::Active); queue(projects, {Id(Constants::BUILDSTEPS_BUILD)}, configSelection);
} }
void BuildManager::cleanProjects(const QList<Project *> &projects) void BuildManager::cleanProjects(const QList<Project *> &projects, ConfigSelection configSelection)
{ {
queue(projects, {Id(Constants::BUILDSTEPS_CLEAN)}, ConfigSelection::Active); queue(projects, {Id(Constants::BUILDSTEPS_CLEAN)}, configSelection);
} }
void BuildManager::rebuildProjects(const QList<Project *> &projects) void BuildManager::rebuildProjects(const QList<Project *> &projects,
ConfigSelection configSelection)
{ {
queue(projects, {Id(Constants::BUILDSTEPS_CLEAN), Id(Constants::BUILDSTEPS_BUILD)}, queue(projects, {Id(Constants::BUILDSTEPS_CLEAN), Id(Constants::BUILDSTEPS_BUILD)},
ConfigSelection::Active); configSelection);
} }
void BuildManager::deployProjects(const QList<Project *> &projects) void BuildManager::deployProjects(const QList<Project *> &projects)

6
src/plugins/projectexplorer/buildmanager.h
View File

@@ -62,9 +62,9 @@ public:
); );
static void cleanProjectWithDependencies(Project *project, ConfigSelection configSelection); static void cleanProjectWithDependencies(Project *project, ConfigSelection configSelection);
static void rebuildProjectWithDependencies(Project *project, ConfigSelection configSelection); static void rebuildProjectWithDependencies(Project *project, ConfigSelection configSelection);
static void buildProjects(const QList<Project *> &projects); static void buildProjects(const QList<Project *> &projects, ConfigSelection configSelection);
static void cleanProjects(const QList<Project *> &projects); static void cleanProjects(const QList<Project *> &projects, ConfigSelection configSelection);
static void rebuildProjects(const QList<Project *> &projects); static void rebuildProjects(const QList<Project *> &projects, ConfigSelection configSelection);
static void deployProjects(const QList<Project *> &projects); static void deployProjects(const QList<Project *> &projects);

59
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -199,12 +199,14 @@ const char BUILDPROJECTONLY[] = "ProjectExplorer.BuildProjectOnly";
const char BUILDCM[] = "ProjectExplorer.BuildCM"; const char BUILDCM[] = "ProjectExplorer.BuildCM";
const char BUILDDEPENDCM[] = "ProjectExplorer.BuildDependenciesCM"; const char BUILDDEPENDCM[] = "ProjectExplorer.BuildDependenciesCM";
const char BUILDSESSION[] = "ProjectExplorer.BuildSession"; const char BUILDSESSION[] = "ProjectExplorer.BuildSession";
const char BUILDSESSIONALLCONFIGS[] = "ProjectExplorer.BuildSessionForAllConfigs";
const char REBUILDPROJECTONLY[] = "ProjectExplorer.RebuildProjectOnly"; const char REBUILDPROJECTONLY[] = "ProjectExplorer.RebuildProjectOnly";
const char REBUILD[] = "ProjectExplorer.Rebuild"; const char REBUILD[] = "ProjectExplorer.Rebuild";
const char REBUILDALLCONFIGS[] = "ProjectExplorer.RebuildProjectForAllConfigs"; const char REBUILDALLCONFIGS[] = "ProjectExplorer.RebuildProjectForAllConfigs";
const char REBUILDCM[] = "ProjectExplorer.RebuildCM"; const char REBUILDCM[] = "ProjectExplorer.RebuildCM";
const char REBUILDDEPENDCM[] = "ProjectExplorer.RebuildDependenciesCM"; const char REBUILDDEPENDCM[] = "ProjectExplorer.RebuildDependenciesCM";
const char REBUILDSESSION[] = "ProjectExplorer.RebuildSession"; const char REBUILDSESSION[] = "ProjectExplorer.RebuildSession";
const char REBUILDSESSIONALLCONFIGS[] = "ProjectExplorer.RebuildSessionForAllConfigs";
const char DEPLOYPROJECTONLY[] = "ProjectExplorer.DeployProjectOnly"; const char DEPLOYPROJECTONLY[] = "ProjectExplorer.DeployProjectOnly";
const char DEPLOY[] = "ProjectExplorer.Deploy"; const char DEPLOY[] = "ProjectExplorer.Deploy";
const char DEPLOYCM[] = "ProjectExplorer.DeployCM"; const char DEPLOYCM[] = "ProjectExplorer.DeployCM";
@@ -215,6 +217,7 @@ const char CLEANALLCONFIGS[] = "ProjectExplorer.CleanProjectForAllConfigs";
const char CLEANCM[] = "ProjectExplorer.CleanCM"; const char CLEANCM[] = "ProjectExplorer.CleanCM";
const char CLEANDEPENDCM[] = "ProjectExplorer.CleanDependenciesCM"; const char CLEANDEPENDCM[] = "ProjectExplorer.CleanDependenciesCM";
const char CLEANSESSION[] = "ProjectExplorer.CleanSession"; const char CLEANSESSION[] = "ProjectExplorer.CleanSession";
const char CLEANSESSIONALLCONFIGS[] = "ProjectExplorer.CleanSessionForAllConfigs";
const char CANCELBUILD[] = "ProjectExplorer.CancelBuild"; const char CANCELBUILD[] = "ProjectExplorer.CancelBuild";
const char RUN[] = "ProjectExplorer.Run"; const char RUN[] = "ProjectExplorer.Run";
const char RUNWITHOUTDEPLOY[] = "ProjectExplorer.RunWithoutDeploy"; const char RUNWITHOUTDEPLOY[] = "ProjectExplorer.RunWithoutDeploy";
@@ -482,12 +485,14 @@ public:
QAction *m_buildActionContextMenu; QAction *m_buildActionContextMenu;
QAction *m_buildDependenciesActionContextMenu; QAction *m_buildDependenciesActionContextMenu;
QAction *m_buildSessionAction; QAction *m_buildSessionAction;
QAction *m_buildSessionForAllConfigsAction;
QAction *m_rebuildProjectOnlyAction; QAction *m_rebuildProjectOnlyAction;
Utils::ParameterAction *m_rebuildAction; Utils::ParameterAction *m_rebuildAction;
Utils::ParameterAction *m_rebuildProjectForAllConfigsAction; Utils::ParameterAction *m_rebuildProjectForAllConfigsAction;
QAction *m_rebuildActionContextMenu; QAction *m_rebuildActionContextMenu;
QAction *m_rebuildDependenciesActionContextMenu; QAction *m_rebuildDependenciesActionContextMenu;
QAction *m_rebuildSessionAction; QAction *m_rebuildSessionAction;
QAction *m_rebuildSessionForAllConfigsAction;
QAction *m_cleanProjectOnlyAction; QAction *m_cleanProjectOnlyAction;
QAction *m_deployProjectOnlyAction; QAction *m_deployProjectOnlyAction;
Utils::ParameterAction *m_deployAction; Utils::ParameterAction *m_deployAction;
@@ -498,6 +503,7 @@ public:
QAction *m_cleanActionContextMenu; QAction *m_cleanActionContextMenu;
QAction *m_cleanDependenciesActionContextMenu; QAction *m_cleanDependenciesActionContextMenu;
QAction *m_cleanSessionAction; QAction *m_cleanSessionAction;
QAction *m_cleanSessionForAllConfigsAction;
QAction *m_runAction; QAction *m_runAction;
QAction *m_runActionContextMenu; QAction *m_runActionContextMenu;
QAction *m_runWithoutDeployAction; QAction *m_runWithoutDeployAction;
@@ -1078,30 +1084,54 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// build session action // build session action
const QIcon sideBarIcon = Utils::Icon::sideBarIcon(Icons::BUILD, Icons::BUILD_FLAT); const QIcon sideBarIcon = Utils::Icon::sideBarIcon(Icons::BUILD, Icons::BUILD_FLAT);
const QIcon buildIcon = Utils::Icon::combinedIcon({Icons::BUILD_SMALL.icon(), sideBarIcon}); const QIcon buildIcon = Utils::Icon::combinedIcon({Icons::BUILD_SMALL.icon(), sideBarIcon});
dd->m_buildSessionAction = new QAction(buildIcon, tr("Build All"), this); dd->m_buildSessionAction = new QAction(buildIcon, tr("Build All Projects"), this);
cmd = ActionManager::registerAction(dd->m_buildSessionAction, Constants::BUILDSESSION); cmd = ActionManager::registerAction(dd->m_buildSessionAction, Constants::BUILDSESSION);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B")));
mbuild->addAction(cmd, Constants::G_BUILD_BUILD); mbuild->addAction(cmd, Constants::G_BUILD_BUILD);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
dd->m_buildSessionForAllConfigsAction
= new QAction(buildIcon, tr("Build All Projects For All Configurations"), this);
cmd = ActionManager::registerAction(dd->m_buildSessionForAllConfigsAction,
Constants::BUILDSESSIONALLCONFIGS);
mbuild->addAction(cmd, Constants::G_BUILD_BUILD);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
// deploy session // deploy session
dd->m_deploySessionAction = new QAction(tr("Deploy All"), this); dd->m_deploySessionAction = new QAction(tr("Deploy All Projects"), this);
cmd = ActionManager::registerAction(dd->m_deploySessionAction, Constants::DEPLOYSESSION); cmd = ActionManager::registerAction(dd->m_deploySessionAction, Constants::DEPLOYSESSION);
mbuild->addAction(cmd, Constants::G_BUILD_DEPLOY); mbuild->addAction(cmd, Constants::G_BUILD_DEPLOY);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
// rebuild session action // rebuild session action
dd->m_rebuildSessionAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild All"), this); dd->m_rebuildSessionAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild All Projects"),
this);
cmd = ActionManager::registerAction(dd->m_rebuildSessionAction, Constants::REBUILDSESSION); cmd = ActionManager::registerAction(dd->m_rebuildSessionAction, Constants::REBUILDSESSION);
mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); mbuild->addAction(cmd, Constants::G_BUILD_REBUILD);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
dd->m_rebuildSessionForAllConfigsAction
= new QAction(Icons::REBUILD.icon(), tr("Rebuild All Projects For All Configurations"),
this);
cmd = ActionManager::registerAction(dd->m_rebuildSessionForAllConfigsAction,
Constants::REBUILDSESSIONALLCONFIGS);
mbuild->addAction(cmd, Constants::G_BUILD_REBUILD);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
// clean session // clean session
dd->m_cleanSessionAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean All"), this); dd->m_cleanSessionAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean All Projects"),
this);
cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION); cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION);
mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
dd->m_cleanSessionForAllConfigsAction = new QAction(Utils::Icons::CLEAN.icon(),
tr("Clean All Projects For All Configurations"), this);
cmd = ActionManager::registerAction(dd->m_cleanSessionForAllConfigsAction,
Constants::CLEANSESSIONALLCONFIGS);
mbuild->addAction(cmd, Constants::G_BUILD_CLEAN);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
// build action // build action
dd->m_buildAction = new Utils::ParameterAction(tr("Build Project"), tr("Build Project \"%1\""), dd->m_buildAction = new Utils::ParameterAction(tr("Build Project"), tr("Build Project \"%1\""),
Utils::ParameterAction::AlwaysEnabled, this); Utils::ParameterAction::AlwaysEnabled, this);
@@ -1550,7 +1580,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
BuildManager::buildProjectWithDependencies(ProjectTree::currentProject()); BuildManager::buildProjectWithDependencies(ProjectTree::currentProject());
}); });
connect(dd->m_buildSessionAction, &QAction::triggered, dd, [] { connect(dd->m_buildSessionAction, &QAction::triggered, dd, [] {
BuildManager::buildProjects(SessionManager::projectOrder()); BuildManager::buildProjects(SessionManager::projectOrder(), ConfigSelection::Active);
});
connect(dd->m_buildSessionForAllConfigsAction, &QAction::triggered, dd, [] {
BuildManager::buildProjects(SessionManager::projectOrder(), ConfigSelection::All);
}); });
connect(dd->m_rebuildProjectOnlyAction, &QAction::triggered, dd, [] { connect(dd->m_rebuildProjectOnlyAction, &QAction::triggered, dd, [] {
BuildManager::rebuildProjectWithoutDependencies(SessionManager::startupProject()); BuildManager::rebuildProjectWithoutDependencies(SessionManager::startupProject());
@@ -1571,7 +1604,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
ConfigSelection::Active); ConfigSelection::Active);
}); });
connect(dd->m_rebuildSessionAction, &QAction::triggered, dd, [] { connect(dd->m_rebuildSessionAction, &QAction::triggered, dd, [] {
BuildManager::rebuildProjects(SessionManager::projectOrder()); BuildManager::rebuildProjects(SessionManager::projectOrder(), ConfigSelection::Active);
});
connect(dd->m_rebuildSessionForAllConfigsAction, &QAction::triggered, dd, [] {
BuildManager::rebuildProjects(SessionManager::projectOrder(), ConfigSelection::All);
}); });
connect(dd->m_deployProjectOnlyAction, &QAction::triggered, dd, [] { connect(dd->m_deployProjectOnlyAction, &QAction::triggered, dd, [] {
BuildManager::deployProjects({SessionManager::startupProject()}); BuildManager::deployProjects({SessionManager::startupProject()});
@@ -1604,7 +1640,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
ConfigSelection::Active); ConfigSelection::Active);
}); });
connect(dd->m_cleanSessionAction, &QAction::triggered, dd, [] { connect(dd->m_cleanSessionAction, &QAction::triggered, dd, [] {
BuildManager::cleanProjects(SessionManager::projectOrder()); BuildManager::cleanProjects(SessionManager::projectOrder(), ConfigSelection::Active);
});
connect(dd->m_cleanSessionForAllConfigsAction, &QAction::triggered, dd, [] {
BuildManager::cleanProjects(SessionManager::projectOrder(), ConfigSelection::All);
}); });
connect(dd->m_runAction, &QAction::triggered, connect(dd->m_runAction, &QAction::triggered,
dd, []() { m_instance->runStartupProject(Constants::NORMAL_RUN_MODE); }); dd, []() { m_instance->runStartupProject(Constants::NORMAL_RUN_MODE); });
@@ -2601,12 +2640,18 @@ void ProjectExplorerPluginPrivate::updateActions()
aci->menu()->menuAction()->setVisible(SessionManager::projects().size() > 1); aci->menu()->menuAction()->setVisible(SessionManager::projects().size() > 1);
m_buildSessionAction->setEnabled(buildSessionState.first); m_buildSessionAction->setEnabled(buildSessionState.first);
m_buildSessionForAllConfigsAction->setEnabled(buildSessionState.first);
m_rebuildSessionAction->setEnabled(buildSessionState.first); m_rebuildSessionAction->setEnabled(buildSessionState.first);
m_rebuildSessionForAllConfigsAction->setEnabled(buildSessionState.first);
m_cleanSessionAction->setEnabled(buildSessionState.first); m_cleanSessionAction->setEnabled(buildSessionState.first);
m_cleanSessionForAllConfigsAction->setEnabled(buildSessionState.first);
m_buildSessionAction->setToolTip(buildSessionState.second); m_buildSessionAction->setToolTip(buildSessionState.second);
m_buildSessionForAllConfigsAction->setToolTip(buildSessionState.second);
m_rebuildSessionAction->setToolTip(buildSessionState.second); m_rebuildSessionAction->setToolTip(buildSessionState.second);
m_rebuildSessionForAllConfigsAction->setToolTip(buildSessionState.second);
m_cleanSessionAction->setToolTip(buildSessionState.second); m_cleanSessionAction->setToolTip(buildSessionState.second);
m_cleanSessionForAllConfigsAction->setToolTip(buildSessionState.second);
m_cancelBuildAction->setEnabled(BuildManager::isBuilding()); m_cancelBuildAction->setEnabled(BuildManager::isBuilding());