diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-04 17:11:04 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-18 10:22:40 +0100 |
commit | f5697c64ef4f1c2784b18702e6ff842ae124deb5 (patch) | |
tree | da5defee48d401f29e03306f75b86bb5f4e368f5 /src/lib/corelib/buildgraph/executorjob.cpp | |
parent | 58eab9ee4ca2f9f34d6ecb6648e7d5095de5aeb0 (diff) |
De-obfuscate Executor.
Transformers are what jobs work on, not artifacts.
Change-Id: Ib267ec247dd6d165347511f0a0fdb3db00c58832
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/executorjob.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/executorjob.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp index 281d82e36..f747ca7d8 100644 --- a/src/lib/corelib/buildgraph/executorjob.cpp +++ b/src/lib/corelib/buildgraph/executorjob.cpp @@ -29,6 +29,7 @@ #include "executorjob.h" +#include "artifact.h" #include "command.h" #include "jscommandexecutor.h" #include "processcommandexecutor.h" @@ -78,7 +79,7 @@ void ExecutorJob::setDryRun(bool enabled) m_jsCommandExecutor->setDryRunEnabled(enabled); } -void ExecutorJob::run(Transformer *t, const ResolvedProductPtr &product) +void ExecutorJob::run(Transformer *t) { QBS_ASSERT(m_currentCommandIdx == -1, return); @@ -88,8 +89,9 @@ void ExecutorJob::run(Transformer *t, const ResolvedProductPtr &product) } t->propertiesRequestedInCommands.clear(); - m_processCommandExecutor->setProcessEnvironment(product->buildEnvironment); - + QBS_CHECK(!t->outputs.isEmpty()); + m_processCommandExecutor->setProcessEnvironment( + (*t->outputs.begin())->product->buildEnvironment); m_transformer = t; runNextCommand(); } |