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

Qbs, Qmake, Python, Generic: Introduce BuildSystem derived classes

Browse Source 
... and move context menu action handling there.

This is a temporary measure to be able to move that functionality
alongside the actual BuildSystem to the BuildConfiguration.

There is a lot to be cleaned up left, to keep the patch small.

Change-Id: If4b0820a13b376fc97b70785052924972ce22705
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-10-22 14:55:51 +02:00
parent e1baae2e20
commit 66c7d75dbd
24 changed files with 707 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/buildsystem.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/deploymentdata.h>
#include <projectexplorer/headerpath.h>
@@ -118,17 +119,14 @@ private:
//
////////////////////////////////////////////////////////////////////////////////////
class GenericProjectNode : public ProjectNode
class GenericBuildSytem : public BuildSystem
{
public:
explicit GenericProjectNode(GenericProject *project) :
ProjectNode(project->projectDirectory()),
m_project(project)
{
setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
}
explicit GenericBuildSytem(GenericProject *project)
: BuildSystem(project)
{}
bool supportsAction(ProjectAction action, const Node *) const override
bool supportsAction(Node *, ProjectAction action, const Node *) const override
{
return action == AddNewFile
|| action == AddExistingFile
@@ -137,25 +135,25 @@ public:
|| action == Rename;
}
bool addFiles(const QStringList &filePaths, QStringList * = nullptr) override
bool addFiles(Node *, const QStringList &filePaths, QStringList *) override
{
return m_project->addFiles(filePaths);
return project()->addFiles(filePaths);
}
RemovedFilesFromProject removeFiles(const QStringList &filePaths,
RemovedFilesFromProject removeFiles(Node *, const QStringList &filePaths,
QStringList * = nullptr) override
{
return m_project->removeFiles(filePaths) ? RemovedFilesFromProject::Ok
return project()->removeFiles(filePaths) ? RemovedFilesFromProject::Ok
: RemovedFilesFromProject::Error;
}
bool renameFile(const QString &filePath, const QString &newFilePath) override
bool renameFile(Node *, const QString &filePath, const QString &newFilePath) override
{
return m_project->renameFile(filePath, newFilePath);
return project()->renameFile(filePath, newFilePath);
}
private:
GenericProject *m_project = nullptr;
GenericProject *project() { return static_cast<GenericProject *>(BuildSystem::project()); }
};
@@ -178,6 +176,7 @@ GenericProject::GenericProject(const Utils::FilePath &fileName)
setId(Constants::GENERICPROJECT_ID);
setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
setDisplayName(fileName.toFileInfo().completeBaseName());
setBuildSystem(std::make_unique<GenericBuildSytem>(this));
QObject *projectUpdaterFactory = ExtensionSystem::PluginManager::getObjectByName(
"CppProjectUpdaterFactory");
@@ -432,7 +431,8 @@ void GenericProject::refresh(RefreshOptions options)
parseProject(options);
if (options & Files) {
auto newRoot = std::make_unique<GenericProjectNode>(this);
auto newRoot = std::make_unique<ProjectNode>(projectDirectory());
newRoot->setDisplayName(projectFilePath().toFileInfo().completeBaseName());
// find the common base directory of all source files
Utils::FilePath baseDir = findCommonSourceRoot();