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

ShellCommand: Allow setting working directory per job

Browse Source 
Change-Id: I6d541f87b76bdc7f1503f202792079f833e8932c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-06-08 15:04:04 +02:00
parent ccbc7f9ec1
commit f2be797696
6 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/shellcommand.h
View File

@@ -115,14 +115,15 @@ public:
ShellCommand(const QString &workingDirectory, const QProcessEnvironment &environment);
~ShellCommand();
~ShellCommand() override;
QString displayName() const;
void setDisplayName(const QString &name);
void addJob(const FileName &binary, const QStringList &arguments, ExitCodeInterpreter *interpreter = 0);
void addJob(const FileName &binary, const QStringList &arguments,
const QString &workingDirectory = QString(), ExitCodeInterpreter *interpreter = 0);
void addJob(const FileName &binary, const QStringList &arguments, int timeoutS,
ExitCodeInterpreter *interpreter = 0);
const QString &workingDirectory = QString(), ExitCodeInterpreter *interpreter = 0);
void execute();
void abort();
bool lastExecutionSuccess() const;
@@ -149,10 +150,13 @@ public:
void setOutputProxyFactory(const std::function<OutputProxy *()> &factory);
virtual SynchronousProcessResponse runCommand(const FileName &binary, const QStringList &arguments,
int timeoutS, ExitCodeInterpreter *interpreter = 0);
int timeoutS,
const QString &workingDirectory = QString(),
ExitCodeInterpreter *interpreter = 0);
// Make sure to not pass through the event loop at all:
virtual bool runFullySynchronous(const FileName &binary, const QStringList &arguments,
int timeoutS, QByteArray *outputData, QByteArray *errorData);
int timeoutS, QByteArray *outputData, QByteArray *errorData,
const QString &workingDirectory = QString());
public slots:
void cancel();
@@ -168,11 +172,13 @@ signals:
protected:
virtual unsigned processFlags() const;
virtual void addTask(QFuture<void> &future);
QString workDirectory(const QString &wd) const;
private:
void run(QFutureInterface<void> &future);
SynchronousProcessResponse runSynchronous(const FileName &binary, const QStringList &arguments,
int timeoutS, ExitCodeInterpreter *interpreter = 0);
int timeoutS, const QString &workingDirectory,
ExitCodeInterpreter *interpreter = 0);
class Internal::ShellCommandPrivate *const d;
};