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

replace env variable injection with pervasive expando support

Browse Source 
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
This commit is contained in:
Oswald Buddenhagen
2010-11-12 17:23:55 +01:00
parent 1e362b0f8b
commit 79be54ed8c
24 changed files with 457 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -104,16 +104,14 @@ bool GenericMakeStep::init()
GenericBuildConfiguration *bc = genericBuildConfiguration();
setEnabled(true);
QString buildDir = bc->buildDirectory();
Utils::expandMacros(&buildDir, Core::VariableManager::instance()->macroExpander());
setWorkingDirectory(buildDir);
ProjectExplorer::ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander());
pp->setWorkingDirectory(bc->buildDirectory());
pp->setEnvironment(bc->environment());
pp->setCommand(makeCommand());
pp->setArguments(allArguments());
setCommand(makeCommand());
setArguments(replacedArguments());
setEnvironment(bc->environment());
setOutputParser(new ProjectExplorer::GnuMakeParser(buildDir));
setOutputParser(new ProjectExplorer::GnuMakeParser(pp->effectiveWorkingDirectory()));
if (bc->genericTarget()->genericProject()->toolChain())
appendOutputParser(bc->genericTarget()->genericProject()->toolChain()->outputParser());
@@ -139,13 +137,11 @@ bool GenericMakeStep::fromMap(const QVariantMap &map)
return BuildStep::fromMap(map);
}
QString GenericMakeStep::replacedArguments() const
QString GenericMakeStep::allArguments() const
{
QString replacedArguments = m_makeArguments;
Utils::QtcProcess::addArgs(&replacedArguments, m_buildTargets);
Utils::QtcProcess::expandMacros(&replacedArguments,
Core::VariableManager::instance()->macroExpander());
return replacedArguments;
QString args = m_makeArguments;
Utils::QtcProcess::addArgs(&args, m_buildTargets);
return args;
}
QString GenericMakeStep::makeCommand() const
@@ -257,8 +253,15 @@ void GenericMakeStepConfigWidget::init()
void GenericMakeStepConfigWidget::updateDetails()
{
m_summaryText = tr("<b>Make:</b> %1 %2")
.arg(m_makeStep->makeCommand(), m_makeStep->replacedArguments());
GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration();
ProjectExplorer::ProcessParameters param;
param.setMacroExpander(bc->macroExpander());
param.setWorkingDirectory(bc->buildDirectory());
param.setEnvironment(bc->environment());
param.setCommand(m_makeStep->makeCommand());
param.setArguments(m_makeStep->allArguments());
m_summaryText = param.summary(displayName());
emit updateSummary();
}