forked from qt-creator/qt-creator
Remove value(name) and setValue(name, value) from BuildStep
This commit is contained in:
@@ -39,92 +39,54 @@
|
||||
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
static const char * const PROCESS_COMMAND = "abstractProcess.command";
|
||||
static const char * const PROCESS_WORKINGDIRECTORY = "abstractProcess.workingDirectory";
|
||||
static const char * const PROCESS_ARGUMENTS = "abstractProcess.arguments";
|
||||
static const char * const PROCESS_ENABLED = "abstractProcess.enabled";
|
||||
static const char * const PROCESS_ENVIRONMENT = "abstractProcess.Environment";
|
||||
static const char * const PROCESS_IGNORE_RETURN_VALUE = "abstractProcess.IgnoreReturnValue";
|
||||
|
||||
AbstractProcessStep::AbstractProcessStep(Project *pro)
|
||||
: BuildStep(pro)
|
||||
{
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setCommand(const QString &buildConfiguration, const QString &cmd)
|
||||
void AbstractProcessStep::setCommand(const QString &cmd)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_COMMAND, cmd);
|
||||
m_command = cmd;
|
||||
}
|
||||
|
||||
QString AbstractProcessStep::command(const QString &buildConfiguration) const
|
||||
QString AbstractProcessStep::workingDirectory() const
|
||||
{
|
||||
QString result = value(buildConfiguration, PROCESS_COMMAND).toString();
|
||||
if (QFileInfo(result).isRelative()) {
|
||||
QString searchInPath = environment(buildConfiguration).searchInPath(result);
|
||||
return m_workingDirectory;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setWorkingDirectory(const QString &workingDirectory)
|
||||
{
|
||||
m_workingDirectory = workingDirectory;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setArguments(const QStringList &arguments)
|
||||
{
|
||||
m_arguments = arguments;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setEnabled(bool b)
|
||||
{
|
||||
m_enabled = b;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setIgnoreReturnValue(bool b)
|
||||
{
|
||||
m_ignoreReturnValue = b;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setEnvironment(Environment env)
|
||||
{
|
||||
m_environment = env;
|
||||
}
|
||||
|
||||
bool AbstractProcessStep::init(const QString &buildConfiguration)
|
||||
{
|
||||
Q_UNUSED(buildConfiguration)
|
||||
if (QFileInfo(m_command).isRelative()) {
|
||||
QString searchInPath = m_environment.searchInPath(m_command);
|
||||
if (!searchInPath.isEmpty())
|
||||
result = searchInPath;
|
||||
m_command = searchInPath;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setWorkingDirectory(const QString &buildConfiguration, const QString &workingDirectory)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_WORKINGDIRECTORY, workingDirectory);
|
||||
}
|
||||
|
||||
QString AbstractProcessStep::workingDirectory(const QString &buildConfiguration) const
|
||||
{
|
||||
return value(buildConfiguration, PROCESS_WORKINGDIRECTORY).toString();
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setArguments(const QString &buildConfiguration, const QStringList &arguments)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_ARGUMENTS, arguments);
|
||||
}
|
||||
|
||||
QStringList AbstractProcessStep::arguments(const QString &buildConfiguration) const
|
||||
{
|
||||
return value(buildConfiguration, PROCESS_ARGUMENTS).toStringList();
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setEnabled(const QString &buildConfiguration, bool b)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_ENABLED, b);
|
||||
}
|
||||
|
||||
bool AbstractProcessStep::enabled(const QString &buildConfiguration) const
|
||||
{
|
||||
return value(buildConfiguration, PROCESS_ENABLED).toBool();
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setIgnoreReturnValue(const QString &buildConfiguration, bool b)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_IGNORE_RETURN_VALUE, b);
|
||||
}
|
||||
|
||||
bool AbstractProcessStep::ignoreReturnValue(const QString &buildConfiguration) const
|
||||
{
|
||||
return value(buildConfiguration, PROCESS_IGNORE_RETURN_VALUE).toBool();
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setEnvironment(const QString &buildConfiguration, Environment env)
|
||||
{
|
||||
setValue(buildConfiguration, PROCESS_ENVIRONMENT, env.toStringList());
|
||||
}
|
||||
|
||||
Environment AbstractProcessStep::environment(const QString &buildConfiguration) const
|
||||
{
|
||||
return Environment(value(buildConfiguration, PROCESS_ENVIRONMENT).toStringList());
|
||||
}
|
||||
|
||||
bool AbstractProcessStep::init(const QString &name)
|
||||
{
|
||||
m_command = command(name);
|
||||
m_arguments = arguments(name);
|
||||
m_enabled = enabled(name);
|
||||
m_workingDirectory = workingDirectory(name);
|
||||
m_environment = environment(name);
|
||||
m_ignoreReturnValue = ignoreReturnValue(name);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user