aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/transformer.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-02-10 18:08:01 +0100
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-02-13 15:33:27 +0100
commite73f60919079fc7cb0f0ad6d50b1a364c7b0d2a6 (patch)
tree3ce15f1f9b336063d591999ce325ce28a6e21320 /src/lib/corelib/buildgraph/transformer.h
parenta3634a6bbb193c47cdec887a6b29356c979961aa (diff)
support transformers with an unknown number of outputs
To support different types of nodes in the build graph, we introduce the base class BuildGraphNode. Artifact now derives from BuildGraphNode. A RuleNode class is introduced that represents a rule in the build graph. Rules are applied in the build phase and not in a pre-build phase anymore. The handling of moc has been revisited. The fixed automoc pre-build phase is no more. This is the squashed merge of a feature branch. Task-number: QBS-370 Change-Id: If27cdc51cba8c9542e4282c2caa456faa723aeff Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/transformer.h')
-rw-r--r--src/lib/corelib/buildgraph/transformer.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/transformer.h b/src/lib/corelib/buildgraph/transformer.h
index 3ef30cc29..ee9ee4002 100644
--- a/src/lib/corelib/buildgraph/transformer.h
+++ b/src/lib/corelib/buildgraph/transformer.h
@@ -56,7 +56,7 @@ public:
ArtifactSet inputs; // Subset of "children of all outputs".
ArtifactSet outputs;
RuleConstPtr rule;
- QList<AbstractCommand *> commands;
+ QList<AbstractCommandPtr> commands;
PropertyList propertiesRequestedInPrepareScript;
PropertyList propertiesRequestedInCommands;
QHash<QString, PropertyList> propertiesRequestedFromArtifactInPrepareScript;
@@ -69,7 +69,9 @@ public:
const QString &defaultModuleName);
ResolvedProductPtr product() const;
- void setupInputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue);
+ static void setupInputs(QScriptValue targetScriptValue, const ArtifactSet &inputs,
+ const QString &defaultModuleName);
+ void setupInputs(QScriptValue targetScriptValue);
void setupOutputs(QScriptEngine *scriptEngine, QScriptValue targetScriptValue);
void createCommands(const ScriptFunctionConstPtr &script,
const RulesEvaluationContextPtr &evalContext, const QScriptValueList &args);