diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index a013083c5724079cfd42d10ba945ed5a84bd7fd4..bbc006607fbefe297c05bc56f050e3a0740a2e6d 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -193,7 +193,7 @@ FileName CMakeBuildConfiguration::shadowBuildDirectory(const FileName &projectFi return FileName(); const QString projectName = projectFilePath.parentDir().fileName(); - ProjectMacroExpander expander(projectName, k, bcName, buildType); + ProjectMacroExpander expander(projectFilePath.toString(), projectName, k, bcName, buildType); QDir projectDir = QDir(Project::projectDirectory(projectFilePath).toString()); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); return FileName::fromUserInput(projectDir.absoluteFilePath(buildPath)); diff --git a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp index bd75e16c7c49c0ced5b3f1ddb86180693c816fb4..44485c664ae9d8a6478f60ab092be183d415b5c7 100644 --- a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp +++ b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp @@ -180,7 +180,7 @@ FileName NimBuildConfigurationFactory::defaultBuildDirectory(const Kit *k, { QFileInfo projectFileInfo(projectFilePath); - ProjectMacroExpander expander(projectFileInfo.baseName(), k, bc, buildType); + ProjectMacroExpander expander(projectFilePath, projectFileInfo.baseName(), k, bc, buildType); QString buildDirectory = expander.expand(Core::DocumentManager::buildDirectory()); if (FileUtils::isAbsolutePath(buildDirectory)) diff --git a/src/plugins/projectexplorer/projectmacroexpander.cpp b/src/plugins/projectexplorer/projectmacroexpander.cpp index 9bffc43b9bd1da939da0390a36d5cd12bc23f0de..83aaf2d5fbf87c0536abaeb72cbc1f56e5404a9f 100644 --- a/src/plugins/projectexplorer/projectmacroexpander.cpp +++ b/src/plugins/projectexplorer/projectmacroexpander.cpp @@ -29,10 +29,14 @@ namespace ProjectExplorer { -ProjectMacroExpander::ProjectMacroExpander(const QString &projectName, +ProjectMacroExpander::ProjectMacroExpander(const QString &mainFilePath, const QString &projectName, const Kit *kit, const QString &bcName, BuildConfiguration::BuildType buildType) { + registerFileVariables(Constants::VAR_CURRENTPROJECT_PREFIX, + QCoreApplication::translate("ProjectExplorer", "Main file of current project"), + [mainFilePath]() -> QString { return mainFilePath; }); + registerVariable(Constants::VAR_CURRENTPROJECT_NAME, QCoreApplication::translate("ProjectExplorer", "Name of current project"), [projectName] { return projectName; }); diff --git a/src/plugins/projectexplorer/projectmacroexpander.h b/src/plugins/projectexplorer/projectmacroexpander.h index e36d0bf98d24ec9baab0aa4e7ca7d0f30c3dc136..351081c97ed10d56f5b5fa92cf889ed898d1c3cd 100644 --- a/src/plugins/projectexplorer/projectmacroexpander.h +++ b/src/plugins/projectexplorer/projectmacroexpander.h @@ -37,8 +37,8 @@ class Kit; class PROJECTEXPLORER_EXPORT ProjectMacroExpander : public Utils::MacroExpander { public: - ProjectMacroExpander(const QString &projectName, const Kit *kit, const QString &bcName, - BuildConfiguration::BuildType buildType); + ProjectMacroExpander(const QString &mainFilePath, const QString &projectName, const Kit *kit, + const QString &bcName, BuildConfiguration::BuildType buildType); }; } // namespace ProjectExplorer diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 2ce88634ba68bbef0afdb75e9f049fbbb13ab6cf..2136b2fe0df5714eb4f400a940d553c123cd0ca6 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -398,7 +398,7 @@ static Utils::FileName defaultBuildDirectory(const QString &projectFilePath, con BuildConfiguration::BuildType buildType) { const QString projectName = QFileInfo(projectFilePath).completeBaseName(); - ProjectMacroExpander expander(projectName, k, bcName, buildType); + ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType); QString projectDir = Project::projectDirectory(Utils::FileName::fromString(projectFilePath)).toString(); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); return Utils::FileName::fromString(Utils::FileUtils::resolvePath(projectDir, buildPath)); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 426d5cac313e454f940aa029c3681dcaed77a046..99b673003da78a3089760ba707a7d1ed21f9d719 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -78,7 +78,7 @@ QString QmakeBuildConfiguration::shadowBuildDirectory(const QString &proFilePath return QString(); const QString projectName = QFileInfo(proFilePath).completeBaseName(); - ProjectMacroExpander expander(projectName, k, suffix, buildType); + ProjectMacroExpander expander(proFilePath, projectName, k, suffix, buildType); QString projectDir = Project::projectDirectory(FileName::fromString(proFilePath)).toString(); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); return FileUtils::resolvePath(projectDir, buildPath);