diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-10 18:08:01 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-13 15:33:27 +0100 |
commit | e73f60919079fc7cb0f0ad6d50b1a364c7b0d2a6 (patch) | |
tree | 3ce15f1f9b336063d591999ce325ce28a6e21320 /src/lib/corelib/buildgraph/buildgraph.pri | |
parent | a3634a6bbb193c47cdec887a6b29356c979961aa (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/buildgraph.pri')
-rw-r--r-- | src/lib/corelib/buildgraph/buildgraph.pri | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraph.pri b/src/lib/corelib/buildgraph/buildgraph.pri index 4142d94bd..0674f2ca7 100644 --- a/src/lib/corelib/buildgraph/buildgraph.pri +++ b/src/lib/corelib/buildgraph/buildgraph.pri @@ -4,9 +4,9 @@ SOURCES += \ $$PWD/artifactcleaner.cpp \ $$PWD/artifactset.cpp \ $$PWD/artifactvisitor.cpp \ - $$PWD/automoc.cpp \ $$PWD/buildgraph.cpp \ $$PWD/buildgraphloader.cpp \ + $$PWD/buildgraphnode.cpp \ $$PWD/command.cpp \ $$PWD/cycledetector.cpp \ $$PWD/executor.cpp \ @@ -14,11 +14,15 @@ SOURCES += \ $$PWD/filedependency.cpp \ $$PWD/inputartifactscanner.cpp \ $$PWD/jscommandexecutor.cpp \ + $$PWD/nodeset.cpp \ $$PWD/processcommandexecutor.cpp \ $$PWD/productbuilddata.cpp \ $$PWD/productinstaller.cpp \ $$PWD/projectbuilddata.cpp \ + $$PWD/qtmocscanner.cpp \ + $$PWD/rescuableartifactdata.cpp \ $$PWD/rulegraph.cpp \ + $$PWD/rulenode.cpp \ $$PWD/rulesapplicator.cpp \ $$PWD/rulesevaluationcontext.cpp \ $$PWD/scanresultcache.cpp \ @@ -31,9 +35,10 @@ HEADERS += \ $$PWD/artifactcleaner.h \ $$PWD/artifactset.h \ $$PWD/artifactvisitor.h \ - $$PWD/automoc.h \ $$PWD/buildgraph.h \ $$PWD/buildgraphloader.h \ + $$PWD/buildgraphnode.h \ + $$PWD/buildgraphvisitor.h \ $$PWD/command.h \ $$PWD/cycledetector.h \ $$PWD/executor.h \ @@ -42,11 +47,15 @@ HEADERS += \ $$PWD/forward_decls.h \ $$PWD/inputartifactscanner.h \ $$PWD/jscommandexecutor.h \ + $$PWD/nodeset.h \ $$PWD/processcommandexecutor.h \ $$PWD/productbuilddata.h \ $$PWD/productinstaller.h \ $$PWD/projectbuilddata.h \ + $$PWD/qtmocscanner.h \ + $$PWD/rescuableartifactdata.h \ $$PWD/rulegraph.h \ + $$PWD/rulenode.h \ $$PWD/rulesapplicator.h \ $$PWD/rulesevaluationcontext.h \ $$PWD/scanresultcache.h \ |