diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-14 16:34:55 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-14 17:05:17 +0100 |
commit | a9cd2b8c29054c6d5f3b90fc7ae5e047459db810 (patch) | |
tree | acde53f48f29ba72265cf47734aa6a2fd9e3de2e /src/lib/corelib/buildgraph/projectbuilddata.cpp | |
parent | 1bd973e88639588de56b88835670915642481020 (diff) |
rename Rule::script to prepareScript
Rule might get another script besides the prepare script.
This will reduce the diff size for a future patch.
Change-Id: I28755cc0bb30d429108b63c9e9db4cc4c93573b1
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/projectbuilddata.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/projectbuilddata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 1ba53abf2..d671a029b 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -338,7 +338,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc ResolvedModulePtr module = ResolvedModule::create(); module->name = rtrafo->module->name; rule->module = module; - rule->script = rtrafo->transform; + rule->prepareScript = rtrafo->transform; foreach (const SourceArtifactConstPtr &sourceArtifact, rtrafo->outputs) { Artifact *outputArtifact = createArtifact(product, sourceArtifact, m_logger); outputArtifact->artifactType = Artifact::Generated; @@ -358,7 +358,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc transformer->rule = rule; RulesEvaluationContext::Scope s(evalContext().data()); - setupScriptEngineForFile(engine(), transformer->rule->script->fileContext, scope()); + setupScriptEngineForFile(engine(), transformer->rule->prepareScript->fileContext, scope()); QScriptValue prepareScriptContext = engine()->newObject(); PrepareScriptObserver observer(engine()); setupScriptEngineForProduct(engine(), product, transformer->rule, prepareScriptContext, @@ -366,7 +366,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc transformer->setupInputs(engine(), prepareScriptContext); transformer->setupOutputs(engine(), prepareScriptContext); transformer->createCommands(rtrafo->transform, evalContext(), - ScriptEngine::argumentList(transformer->rule->script->argumentNames, + ScriptEngine::argumentList(transformer->rule->prepareScript->argumentNames, prepareScriptContext)); if (Q_UNLIKELY(transformer->commands.isEmpty())) throw ErrorInfo(QString("There's a transformer without commands."), rtrafo->transform->location); |