diff options
author | hjk <hjk@qt.io> | 2019-06-21 08:31:37 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-24 13:47:05 +0000 |
commit | 3170601b4d07c617dcbeb187e5feabf7e4bfa9d0 (patch) | |
tree | 5f58b152babc44969f07ab4af4608ba20d5f2e85 /src/plugins/ios | |
parent | 0d49c2cd2c78ab3eda4722559a8387aebd752537 (diff) |
ProjectExplorer: Prefer ProcessParameters::setCommandLine
... over setting command and args individually.
Change-Id: Iec7c8d3a0b05fb8fa0639f7ddbe7ccdc7387d2a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r-- | src/plugins/ios/iosbuildstep.cpp | 15 | ||||
-rw-r--r-- | src/plugins/ios/iosbuildstep.h | 2 | ||||
-rw-r--r-- | src/plugins/ios/iosdsymbuildstep.cpp | 31 | ||||
-rw-r--r-- | src/plugins/ios/iosdsymbuildstep.h | 10 |
4 files changed, 30 insertions, 28 deletions
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 0fbcb443052..ee6b8ea6e70 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -39,14 +39,18 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> #include <projectexplorer/gcctoolchain.h> + #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtparser.h> + +#include <utils/fileutils.h> #include <utils/stringutils.h> #include <utils/qtcassert.h> #include <utils/qtcprocess.h> using namespace Core; using namespace ProjectExplorer; +using namespace Utils; namespace Ios { namespace Internal { @@ -91,9 +95,7 @@ bool IosBuildStep::init() Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); pp->setEnvironment(env); - pp->setCommand(Utils::FilePath::fromString(buildCommand())); - pp->setArguments(Utils::QtcProcess::joinArgs(allArguments())); - pp->resolveAll(); + pp->setCommandLine({buildCommand(), allArguments()}); // If we are cleaning, then build can fail with an error code, but that doesn't mean // we should stop the clean queue @@ -164,9 +166,9 @@ QStringList IosBuildStep::defaultArguments() const return res; } -QString IosBuildStep::buildCommand() const +FilePath IosBuildStep::buildCommand() const { - return QString("xcodebuild"); // add path? + return FilePath::fromString("xcodebuild"); // add path? } void IosBuildStep::doRun() @@ -253,8 +255,7 @@ void IosBuildStepConfigWidget::updateDetails() param.setMacroExpander(bc->macroExpander()); param.setWorkingDirectory(bc->buildDirectory()); param.setEnvironment(bc->environment()); - param.setCommand(Utils::FilePath::fromString(m_buildStep->buildCommand())); - param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments())); + param.setCommandLine({m_buildStep->buildCommand(), m_buildStep->allArguments()}); setSummaryText(param.summary(displayName())); } diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 227f88b17af..96f7decfa9a 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -54,7 +54,7 @@ public: QStringList baseArguments() const; QStringList allArguments() const; QStringList defaultArguments() const; - QString buildCommand() const; + Utils::FilePath buildCommand() const; private: bool init() override; diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index d238bcfb952..5c6f311a000 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -39,14 +39,17 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/projectexplorerconstants.h> + #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtparser.h> + #include <utils/stringutils.h> #include <utils/qtcassert.h> #include <utils/qtcprocess.h> using namespace Core; using namespace ProjectExplorer; +using namespace Utils; namespace Ios { namespace Internal { @@ -72,9 +75,7 @@ bool IosDsymBuildStep::init() Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); pp->setEnvironment(env); - pp->setCommand(Utils::FilePath::fromString(command())); - pp->setArguments(Utils::QtcProcess::joinArgs(arguments())); - pp->resolveAll(); + pp->setCommandLine({command(), arguments()}); // If we are cleaning, then build can fail with an error code, but that doesn't mean // we should stop the clean queue @@ -97,7 +98,7 @@ QVariantMap IosDsymBuildStep::toMap() const map.insert(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString(), isDefault()); map.insert(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean); - map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command()); + map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command().toVariant()); return map; } @@ -108,8 +109,7 @@ bool IosDsymBuildStep::fromMap(const QVariantMap &map) bool useDefaultArguments = map.value( id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString()).toBool(); m_clean = map.value(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean).toBool(); - m_command = map.value(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), m_command) - .toString(); + m_command = FilePath::fromVariant(map.value(id().withSuffix(COMMAND_PARTIAL_KEY).toString())); if (useDefaultArguments) { m_command = defaultCommand(); m_arguments = defaultArguments(); @@ -125,12 +125,12 @@ QStringList IosDsymBuildStep::defaultArguments() const return defaultCmdList().mid(1); } -QString IosDsymBuildStep::defaultCommand() const +FilePath IosDsymBuildStep::defaultCommand() const { if (m_clean) - return defaultCleanCmdList().at(0); + return FilePath::fromString(defaultCleanCmdList().at(0)); else - return defaultCmdList().at(0); + return FilePath::fromString(defaultCmdList().at(0)); } QStringList IosDsymBuildStep::defaultCleanCmdList() const @@ -158,14 +158,14 @@ QStringList IosDsymBuildStep::defaultCmdList() const return QStringList({dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput()}); } -QString IosDsymBuildStep::command() const +FilePath IosDsymBuildStep::command() const { if (m_command.isEmpty()) return defaultCommand(); return m_command; } -void IosDsymBuildStep::setCommand(const QString &command) +void IosDsymBuildStep::setCommand(const FilePath &command) { if (command == m_command) return; @@ -229,7 +229,7 @@ IosDsymBuildStepConfigWidget::IosDsymBuildStepConfigWidget(IosDsymBuildStep *bui Project *pro = m_buildStep->target()->project(); - m_ui->commandLineEdit->setText(m_buildStep->command()); + m_ui->commandLineEdit->setText(m_buildStep->command().toString()); m_ui->argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs( m_buildStep->arguments())); m_ui->resetDefaultsButton->setEnabled(!m_buildStep->isDefault()); @@ -270,15 +270,14 @@ void IosDsymBuildStepConfigWidget::updateDetails() param.setMacroExpander(bc->macroExpander()); param.setWorkingDirectory(bc->buildDirectory()); param.setEnvironment(bc->environment()); - param.setCommand(Utils::FilePath::fromString(m_buildStep->command())); - param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments())); + param.setCommandLine({m_buildStep->command(), m_buildStep->arguments()}); setSummaryText(param.summary(displayName())); } void IosDsymBuildStepConfigWidget::commandChanged() { - m_buildStep->setCommand(m_ui->commandLineEdit->text()); + m_buildStep->setCommand(FilePath::fromString(m_ui->commandLineEdit->text())); m_ui->resetDefaultsButton->setEnabled(!m_buildStep->isDefault()); updateDetails(); } @@ -295,7 +294,7 @@ void IosDsymBuildStepConfigWidget::resetDefaults() { m_buildStep->setCommand(m_buildStep->defaultCommand()); m_buildStep->setArguments(m_buildStep->defaultArguments()); - m_ui->commandLineEdit->setText(m_buildStep->command()); + m_ui->commandLineEdit->setText(m_buildStep->command().toString()); m_ui->argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs( m_buildStep->arguments())); m_ui->resetDefaultsButton->setEnabled(!m_buildStep->isDefault()); diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 1cd8abcb290..1d03205e34e 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -27,6 +27,8 @@ #include <projectexplorer/abstractprocessstep.h> +#include <utils/fileutils.h> + namespace Ios { namespace Internal { namespace Ui { class IosPresetBuildStep; } @@ -46,9 +48,9 @@ public: void setArguments(const QStringList &args); QStringList arguments() const; QStringList defaultArguments() const; - QString defaultCommand() const; - QString command() const; - void setCommand(const QString &command); + Utils::FilePath defaultCommand() const; + Utils::FilePath command() const; + void setCommand(const Utils::FilePath &command); bool isDefault() const; private: @@ -61,7 +63,7 @@ private: QStringList defaultCmdList() const; QStringList m_arguments; - QString m_command; + Utils::FilePath m_command; bool m_clean; }; |