introduce class BuildGraphNodedynablaster

To support different types of nodes in the build graph, we introduce
the base class BuildGraphNode. Artifact now derives from BuildGraphNode.
A - yet unused - RuleNode class is introduced that represents a rule in
the build graph.

Change-Id: Ie1ad5e7a9e65bfd5f99d3e824737516053de0f94

***new artifacts hash in ProductBuildData

Change-Id: I50521ec64f734bfb3662759076fa5e7912ac084e

***automoc  fixup

Change-Id: Ie2bb228ae38d63deccc600d67d283bc3beda9fec

slightly nicer rule debug output

Change-Id: I60ddef73cd7f0a67055f2d56e6dbe7fa45ddd450

create RuleNode objects and add them to roots

Change-Id: I51a0f89b98cda524d34888ab758d7bd397d82f00

***execute rule nodes on build

Change-Id: I291c32868cd982e37393d6bc8d696f2b63fbff50

***ArtifactSet::fromNodeSet

Change-Id: I7586bcfbe43406c22b1ee1a1fd826beaa247164f

***update after rebase

Change-Id: I5f73afc80b746b11eeb83aeadf29c2358accbab8

***phonytarget

Change-Id: I587b7e072e54b866e8d5ea37c874e6a8baa550e0

update after rebase

Change-Id: I6017c0cbe9244fea04d513f53e3a2a85092bf962

skip nodes early

We must skip Building and Built nodes.
m_leaves can contain duplicates now.

Change-Id: If275106a47c403a455103f4deeb20049548007f5

debug message

Change-Id: I90e238eef72a8a02fb0a9f2c77715f5f15c1442d

disable phony thingy

Change-Id: I7bb60b850b96b65ab738c11e96c3a84cbe58d2f7

connect each output of a rule to the rule itself

Change-Id: I159d76c4b63094058cc9a07ccc2d0b67c7ce06e6

TagScanner

Change-Id: I4741e48cd674c0ca830ee1b4d05b59a8c542694f

TagScanner deps

Change-Id: If3e43a7ac25616cd151229684a085ac8ee787645

update after rebase

Change-Id: I58d49a5ed1049a17733fc2154588f12c1cda53e6

only root tag scanners in product

Change-Id: Ia94732a5632156a5ec3c5518c9596cd4cefac105

run TagScanners

Change-Id: I869a183f2da23a43957a6df45dc5a1b30b10af92

TagScannerRunner

Change-Id: Id3c5fac73e6fb84e56d6ab1d48a959f3677f7a67

crash fix

Change-Id: Ie3c26dbed41ab4615915a08913c495868c3a8910

more TagScanRunner

Change-Id: I80b79f101c0f4d802fb4f6515c0848e369fed066

handle removal of filetags

Change-Id: Icdd8d05c2e26953f7b12d968aa5dfcc23928b9ba

Qt4 build fix

Change-Id: Ie5fcb64e36ddc5004003183bea7243536bc8ab15

do not waste space with type information

Change-Id: I7b9354e6fceead228ba335723b9addeb701bef56

update nodes that must get new transformers

Change-Id: I06cd7ffe606ae643393350c5959ef6475343929f

update after rebase

Change-Id: If080e664972f2950c12fd800a3e4b521e65dca3a

only run tag scanners on changed sources

And do not call RulesApplicator in bgloader.

Change-Id: I5140c91c79a842dab933ad7b328100bdec13cb10

Conflicts:
	src/lib/buildgraph/buildgraphloader.cpp

sketch of moc tagscanners impl

Change-Id: I7736c2da1b1742bc3556ef660c163e6c32cbd4c9

Conflicts:
	share/qbs/modules/Qt/core/core.qbs

MocTagScanner

Change-Id: I87199e8f355b8b20cf2387f4d4190a20bddae0db

fix lib.qbs

Change-Id: Ibcb5bc290d3839b04828f8c9b155577634bcc9e4

moctagscanner split

Change-Id: Iace5d48483c02b5d33d9ccd54ac07162bfc09d27

1 files changed, 31 insertions, 14 deletions

diff --git a/src/lib/buildgraph/buildgraph.cpp b/src/lib/buildgraph/buildgraph.cpp
index f8c4f8b6a..81986be49 100644
--- a/src/lib/buildgraph/buildgraph.cpp
+++ b/src/lib/buildgraph/buildgraph.cpp
@@ -209,14 +209,14 @@ void setupScriptEngineForProduct(ScriptEngine *engine, const ResolvedProductCons
             rule->module->name.isEmpty() ? QScriptValue() : rule->module->name);
 }
 
-bool findPath(Artifact *u, Artifact *v, QList<Artifact*> &path)
+bool findPath(BuildGraphNode *u, BuildGraphNode *v, QList<BuildGraphNode *> &path)
 {
     if (u == v) {
         path.append(v);
         return true;
     }
 
-    for (ArtifactList::const_iterator it = u->children.begin(); it != u->children.end(); ++it) {
+    for (NodeSet::const_iterator it = u->children.begin(); it != u->children.end(); ++it) {
         if (findPath(*it, v, path)) {
             path.prepend(u);
             return true;
@@ -235,7 +235,7 @@ bool findPath(Artifact *u, Artifact *v, QList<Artifact*> &path)
  * also:  children means i depend on or i am produced by
  *        parent means "produced by me" or "depends on me"
  */
-void connect(Artifact *p, Artifact *c)
+void connect(BuildGraphNode *p, BuildGraphNode *c)
 {
     QBS_CHECK(p != c);
     p->children.insert(c);
@@ -243,28 +243,36 @@ void connect(Artifact *p, Artifact *c)
     p->product->topLevelProject()->buildData->isDirty = true;
 }
 
-void loggedConnect(Artifact *u, Artifact *v, const Logger &logger)
+void loggedConnect(BuildGraphNode *u, BuildGraphNode *v, const Logger &logger)
 {
     QBS_CHECK(u != v);
     if (logger.traceEnabled()) {
         logger.qbsTrace() << QString::fromLocal8Bit("[BG] connect '%1' -> '%2'")
-                             .arg(relativeArtifactFileName(u), relativeArtifactFileName(v));
+                             .arg(u->toString(), v->toString());
     }
     connect(u, v);
 }
 
-static bool existsPath(Artifact *u, Artifact *v)
+static bool existsPath(BuildGraphNode *u, BuildGraphNode *v)
 {
     if (u == v)
         return true;
 
-    for (ArtifactList::const_iterator it = u->children.begin(); it != u->children.end(); ++it)
+    for (NodeSet::const_iterator it = u->children.begin(); it != u->children.end(); ++it)
         if (existsPath(*it, v))
             return true;
 
     return false;
 }
 
+static QStringList toStringList(const QList<BuildGraphNode *> &path)
+{
+    QStringList lst;
+    foreach (BuildGraphNode *node, path)
+        lst << node->toString();
+    return lst;
+}
+
 bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
 {
     QBS_CHECK(u != v);
@@ -274,7 +282,7 @@ bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
     }
 
     if (existsPath(v, u)) {
-        QList<Artifact *> circle;
+        QList<BuildGraphNode *> circle;
         findPath(v, u, circle);
         logger.qbsTrace() << "[BG] safeConnect: circle detected " << toStringList(circle);
         return false;
@@ -284,17 +292,22 @@ bool safeConnect(Artifact *u, Artifact *v, const Logger &logger)
     return true;
 }
 
-void disconnect(Artifact *u, Artifact *v, const Logger &logger)
+void disconnect(BuildGraphNode *u, BuildGraphNode *v, const Logger &logger)
 {
     if (logger.traceEnabled()) {
         logger.qbsTrace() << QString::fromLocal8Bit("[BG] disconnect: '%1' '%2'")
-                             .arg(relativeArtifactFileName(u), relativeArtifactFileName(v));
+                             .arg(u->toString(), v->toString());
     }
     u->children.remove(v);
-    u->childrenAddedByScanner.remove(v);
     v->parents.remove(u);
 }
 
+void disconnect(Artifact *u, Artifact *v, const Logger &logger)
+{
+    disconnect(static_cast<BuildGraphNode *>(u), static_cast<BuildGraphNode *>(v), logger);
+    u->childrenAddedByScanner.remove(v);
+}
+
 void removeGeneratedArtifactFromDisk(Artifact *artifact, const Logger &logger)
 {
     if (artifact->artifactType != Artifact::Generated)
@@ -384,7 +397,7 @@ void insertArtifact(const ResolvedProductPtr &product, Artifact *artifact, const
 {
     QBS_CHECK(!artifact->product);
     QBS_CHECK(!artifact->filePath().isEmpty());
-    QBS_CHECK(!product->buildData->artifacts.contains(artifact));
+    QBS_CHECK(!product->buildData->nodes.contains(artifact));
 #ifdef QT_DEBUG
     foreach (const ResolvedProductConstPtr &otherProduct, product->project->products) {
         if (lookupArtifact(otherProduct, artifact->filePath())) {
@@ -401,7 +414,7 @@ void insertArtifact(const ResolvedProductPtr &product, Artifact *artifact, const
         }
     }
 #endif
-    product->buildData->artifacts.insert(artifact);
+    product->buildData->nodes.insert(artifact);
     artifact->product = product;
     product->topLevelProject()->buildData->insertIntoLookupTable(artifact);
     product->topLevelProject()->buildData->isDirty = true;
@@ -414,6 +427,9 @@ void insertArtifact(const ResolvedProductPtr &product, Artifact *artifact, const
 
 static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, const Logger &logger)
 {
+    Q_UNUSED(product);
+    Q_UNUSED(logger);
+#if 0
     logger.qbsDebug() << "Sanity checking product '" << product->name << "'";
     CycleDetector cycleDetector(logger);
     cycleDetector.visitProduct(product);
@@ -443,7 +459,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, con
 
         QBS_CHECK(transformer);
         QBS_CHECK(transformer->outputs.contains(artifact));
-        ArtifactList transformerOutputChildren;
+        ArtifactSet transformerOutputChildren;
         foreach (const Artifact * const output, transformer->outputs) {
             QBS_CHECK(output->transformer == transformer);
             transformerOutputChildren.unite(output->children);
@@ -460,6 +476,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, con
         foreach (Artifact * const transformerInput, transformer->inputs)
             QBS_CHECK(transformerOutputChildren.contains(transformerInput));
     }
+#endif
 }
 
 static void doSanityChecks(const ResolvedProjectPtr &project, QSet<QString> &productNames,