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

Changing string based api to BuildConfiguration based api.

Browse Source 
Builds, but I'm pretty sure it doesn't *work* :)
This commit is contained in:
con
2009-09-24 16:02:02 +02:00
parent 30362e1050
commit acbd4513e3
30 changed files with 737 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,23 +56,24 @@ GenericMakeStep::~GenericMakeStep()
{
}
bool GenericMakeStep::init(const QString &buildConfiguration)
bool GenericMakeStep::init(const QString &buildConfigurationName)
{
const QString buildParser = m_pro->buildParser(buildConfiguration);
ProjectExplorer::BuildConfiguration *bc = m_pro->buildConfiguration(buildConfigurationName);
const QString buildParser = m_pro->buildParser(bc);
setBuildParser(buildParser);
qDebug() << "*** build parser:" << buildParser;
setEnabled(buildConfiguration, true);
setEnabled(buildConfigurationName, true);
Core::VariableManager *vm = Core::VariableManager::instance();
const QString rawBuildDir = m_pro->buildDirectory(buildConfiguration);
const QString rawBuildDir = m_pro->buildDirectory(bc);
const QString buildDir = vm->resolve(rawBuildDir);
setWorkingDirectory(buildConfiguration, buildDir);
setWorkingDirectory(buildConfigurationName, buildDir);
setCommand(buildConfiguration, makeCommand(buildConfiguration));
setArguments(buildConfiguration, replacedArguments(buildConfiguration));
setCommand(buildConfigurationName, makeCommand(buildConfigurationName));
setArguments(buildConfigurationName, replacedArguments(buildConfigurationName));
setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
return AbstractMakeStep::init(buildConfiguration);
setEnvironment(buildConfigurationName, m_pro->environment(bc));
return AbstractMakeStep::init(buildConfigurationName);
}
QStringList GenericMakeStep::replacedArguments(const QString &buildConfiguration) const