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

Allow for variable replacement in build directory and build arguments

Browse Source 
of a generic project. This way one can use variables like
${CURRENT_DOCUMENT:path} or ${CURRENT_DOCUMENT:baseName}.
Amend: Fix coding style according to apoenitz's comment.
Amend2: Some more coding style issues.

Merge-request: 820
Reviewed-by: con <qtc-committer@nokia.com>
This commit is contained in:
Frank Siegert
2009-07-13 11:39:08 +02:00
committed by con
parent 8c00de4536
commit 7c88b3e96c
4 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/toolchain.h>
#include <utils/qtcassert.h>
#include <coreplugin/variablemanager.h>
#include <QtGui/QFormLayout>
#include <QtGui/QGroupBox>
@@ -61,7 +62,10 @@ bool GenericMakeStep::init(const QString &buildConfiguration)
qDebug() << "*** build parser:" << buildParser;
setEnabled(buildConfiguration, true);
setWorkingDirectory(buildConfiguration, m_pro->buildDirectory(buildConfiguration));
Core::VariableManager *vm = Core::VariableManager::instance();
const QString rawBuildDir = m_pro->buildDirectory(buildConfiguration);
const QString buildDir = vm->resolve(rawBuildDir);
setWorkingDirectory(buildConfiguration, buildDir);
QString command = value(buildConfiguration, "makeCommand").toString();
if (command.isEmpty()) {
@@ -74,8 +78,14 @@ bool GenericMakeStep::init(const QString &buildConfiguration)
const QStringList targets = value(buildConfiguration, "buildTargets").toStringList();
QStringList arguments = value(buildConfiguration, "makeArguments").toStringList();
arguments.append(targets);
setArguments(buildConfiguration, arguments);
QStringList replacedArguments;
foreach (const QString &arg, arguments) {
replacedArguments.append(vm->resolve(arg));
}
foreach (const QString &arg, targets) {
replacedArguments.append(vm->resolve(arg));
}
setArguments(buildConfiguration, replacedArguments);
setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
return AbstractMakeStep::init(buildConfiguration);