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

ProjectExplorer: Make BuildSystem:Name variable available

Browse Source 
... for use in the default build dir template.

Task-number: QTCREATORBUG-26147
Change-Id: I1a32d60e0d5e2db514ac315c48c615c55ccda51f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2022-06-03 13:32:49 +02:00
parent 8d659cb7db
commit 21c215f83c
9 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -1369,8 +1369,8 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
const QString projectName = projectFilePath.parentDir().fileName();
const FilePath projectDir = Project::projectDirectory(projectFilePath);
FilePath buildPath = BuildConfiguration::buildDirectoryFromTemplate(projectDir,
projectFilePath, projectName, k, bcName, buildType);
FilePath buildPath = buildDirectoryFromTemplate(projectDir, projectFilePath, projectName, k,
bcName, buildType, "cmake");
if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) {
QString path = buildPath.path();

5
src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
View File

@@ -83,9 +83,8 @@ FilePath MesonBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
return {};
const QString projectName = projectFilePath.parentDir().fileName();
return BuildConfiguration::buildDirectoryFromTemplate(
Project::projectDirectory(projectFilePath),
projectFilePath, projectName, k, bcName, buildType);
return buildDirectoryFromTemplate(Project::projectDirectory(projectFilePath), projectFilePath,
projectName, k, bcName, buildType, "meson");
}
ProjectExplorer::BuildSystem *MesonBuildConfiguration::buildSystem() const

2
src/plugins/nim/project/nimbuildconfiguration.cpp
View File

@@ -53,7 +53,7 @@ static FilePath defaultBuildDirectory(const Kit *k,
{
return BuildConfiguration::buildDirectoryFromTemplate(
projectFilePath.parentDir(), projectFilePath, projectFilePath.baseName(),
k, bc, buildType);
k, bc, buildType, "nim");
}
NimBuildConfiguration::NimBuildConfiguration(Target *target, Utils::Id id)

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

@@ -604,7 +604,8 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
const QString &projectName,
const Kit *kit,
const QString &bcName,
BuildType buildType)
BuildType buildType,
const QString &buildSystem)
{
MacroExpander exp;
@@ -630,6 +631,10 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
QCoreApplication::translate(
"ProjectExplorer", "Name of the project's active build configuration"),
[bcName] { return bcName; });
exp.registerVariable("BuildSystem:Name",
QCoreApplication::translate(
"ProjectExplorer", "Name of the project's active build system"),
[buildSystem] { return buildSystem; });
exp.registerVariable("CurrentBuild:Type",
QCoreApplication::translate("ProjectExplorer", "Type of current build"),
[buildType] { return buildTypeName(buildType); }, false);

3
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -115,7 +115,8 @@ public:
const QString &projectName,
const Kit *kit,
const QString &bcName,
BuildType buildType);
BuildType buildType,
const QString &buildSystem);
bool isActive() const;

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

@@ -454,7 +454,8 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget)
newBc->setBuildDirectory(BuildConfiguration::buildDirectoryFromTemplate(
project->projectDirectory(), project->projectFilePath(),
project->displayName(), newTarget->kit(),
sourceBc->displayName(), sourceBc->buildType()));
sourceBc->displayName(), sourceBc->buildType(),
sourceBc->buildSystem()->name()));
newTarget->addBuildConfiguration(newBc);
if (sourceTarget->activeBuildConfiguration() == sourceBc)
SessionManager::setActiveBuildConfiguration(newTarget, newBc, SetActive::NoCascade);

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -65,7 +65,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit
const QString projectName = projectFilePath.completeBaseName();
return BuildConfiguration::buildDirectoryFromTemplate(
Project::projectDirectory(projectFilePath),
projectFilePath, projectName, k, bcName, buildType);
projectFilePath, projectName, k, bcName, buildType, "qbs");
}
// ---------------------------------------------------------------------------

2
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -89,7 +89,7 @@ static FilePath buildDir(const FilePath &projectFilePath, const Kit *k)
const QString projectName = projectFilePath.completeBaseName();
return BuildConfiguration::buildDirectoryFromTemplate(
Project::projectDirectory(projectFilePath),
projectFilePath, projectName, k, QString(), BuildConfiguration::Unknown);
projectFilePath, projectName, k, QString(), BuildConfiguration::Unknown, "qbs");
}
static bool hasBuildGraph(const QString &dir)

4
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -103,8 +103,8 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
return {};
const QString projectName = proFilePath.completeBaseName();
return BuildConfiguration::buildDirectoryFromTemplate(
Project::projectDirectory(proFilePath), proFilePath, projectName, k, suffix, buildType);
return buildDirectoryFromTemplate(Project::projectDirectory(proFilePath), proFilePath,
projectName, k, suffix, buildType, "qmake");
}
const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration";