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, 27 insertions, 47 deletions

diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp
index 8c3639104..2c8764742 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/buildgraph/buildgraphloader.cpp
@@ -29,7 +29,7 @@
 #include "buildgraphloader.h"
 
 #include "artifact.h"
-#include "artifactlist.h"
+#include "artifactset.h"
 #include "buildgraph.h"
 #include "command.h"
 #include "cycledetector.h"
@@ -85,8 +85,10 @@ static void restoreBackPointers(const ResolvedProjectPtr &project)
         product->project = project;
         if (!product->buildData)
             continue;
-        foreach (Artifact * const a, product->buildData->artifacts)
-            project->topLevelProject()->buildData->insertIntoLookupTable(a);
+        foreach (BuildGraphNode * const n, product->buildData->nodes) {
+            if (Artifact *a = dynamic_cast<Artifact *>(n))
+                project->topLevelProject()->buildData->insertIntoLookupTable(a);
+        }
     }
 
     foreach (const ResolvedProjectPtr &subProject, project->subProjects) {
@@ -216,8 +218,8 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters &paramet
 
             // If the product gets temporarily removed, its artifacts will get disconnected
             // and this structural information will no longer be directly available from them.
-            foreach (const Artifact * const a, product->buildData->artifacts)
-                childLists.insert(a, a->children);
+            foreach (const Artifact * const a, ArtifactSet::fromNodeSet(product->buildData->nodes))
+                childLists.insert(a, ArtifactSet::fromNodeSet(a->children));
         }
     }
 
@@ -247,7 +249,7 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters &paramet
                 } else {
                     if (restoredProduct->enabled) {
                         QBS_CHECK(restoredProduct->buildData);
-                        foreach (Artifact * const a, newlyResolvedProduct->buildData->artifacts) {
+                        foreach (Artifact * const a, ArtifactSet::fromNodeSet(newlyResolvedProduct->buildData->nodes)) {
                             const bool removeFromDisk = a->artifactType == Artifact::Generated;
                             newlyResolvedProduct->topLevelProject()->buildData->removeArtifact(a,
                                     m_logger, removeFromDisk, true);
@@ -257,8 +259,8 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters &paramet
                     productsWithChangedFiles.removeOne(restoredProduct);
                 }
                 if (newlyResolvedProduct->buildData) {
-                    foreach (Artifact * const a, newlyResolvedProduct->buildData->artifacts)
-                        a->product = newlyResolvedProduct;
+                    foreach (BuildGraphNode *node, newlyResolvedProduct->buildData->nodes)
+                        node->product = newlyResolvedProduct;
                 }
 
                 // Keep in list if build data still needs to be resolved.
@@ -391,7 +393,7 @@ void BuildGraphLoader::checkAllProductsForChanges(const QList<ResolvedProductPtr
         if (!newlyResolvedProduct)
             continue;
         if (!productsWithChangedFiles.contains(restoredProduct)
-                && !sourceArtifactListsAreEqual(restoredProduct->allFiles(),
+                && !sourceArtifactSetsAreEqual(restoredProduct->allFiles(),
                                                 newlyResolvedProduct->allFiles())) {
             m_logger.qbsDebug() << "File list of product '" << restoredProduct->name
                                 << "' was changed.";
@@ -462,7 +464,7 @@ bool BuildGraphLoader::checkForPropertyChanges(const ResolvedProductPtr &restore
         return true;
     }
     QSet<TransformerConstPtr> seenTransformers;
-    foreach (Artifact * const artifact, restoredProduct->buildData->artifacts) {
+    foreach (Artifact *artifact, ArtifactSet::fromNodeSet(restoredProduct->buildData->nodes)) {
         const TransformerConstPtr transformer = artifact->transformer;
         if (!transformer || seenTransformers.contains(transformer))
             continue;
@@ -483,7 +485,7 @@ void BuildGraphLoader::onProductRemoved(const ResolvedProductPtr &product,
 
     product->project->products.removeOne(product);
     if (product->buildData) {
-        foreach (Artifact *artifact, product->buildData->artifacts)
+        foreach (Artifact *artifact, ArtifactSet::fromNodeSet(product->buildData->nodes))
             projectBuildData->removeArtifact(artifact, m_logger, removeArtifactsFromDisk, false);
     }
 }
@@ -495,9 +497,8 @@ void BuildGraphLoader::onProductFileListChanged(const ResolvedProductPtr &restor
 
     QBS_CHECK(newlyResolvedProduct->enabled);
 
-    ArtifactsPerFileTagMap artifactsPerFileTag;
     QList<Artifact *> addedArtifacts;
-    ArtifactList artifactsToRemove;
+    ArtifactSet artifactsToRemove;
     QHash<QString, SourceArtifactConstPtr> oldArtifacts, newArtifacts;
 
     const QList<SourceArtifactPtr> restoredProductAllFiles = restoredProduct->allEnabledFiles();
@@ -567,37 +568,29 @@ void BuildGraphLoader::onProductFileListChanged(const ResolvedProductPtr &restor
             // handle added filetags
             foreach (const FileTag &addedFileTag, changedArtifact->fileTags - a->fileTags) {
                 artifact->fileTags += addedFileTag;
-                artifactsPerFileTag[addedFileTag] += artifact;
+                restoredProduct->buildData->registerAddedFileTag(addedFileTag, artifact);
             }
 
             // handle removed filetags
             foreach (const FileTag &removedFileTag, a->fileTags - changedArtifact->fileTags) {
                 artifact->fileTags -= removedFileTag;
-                foreach (Artifact *parent, artifact->parents) {
-                    if (parent->transformer && parent->transformer->rule->inputs.contains(removedFileTag)) {
-                        // this parent has been created because of the removed filetag
-                        newlyResolvedProduct->topLevelProject()->buildData
-                                ->removeArtifactAndExclusiveDependents(parent, m_logger, true,
-                                                                       &artifactsToRemove);
-                    }
-                }
+                restoredProduct->buildData->registerRemovedFileTag(removedFileTag, artifact);
             }
         }
     }
 
-    // apply rules for new artifacts
-    foreach (Artifact *artifact, addedArtifacts)
-        foreach (const FileTag &ft, artifact->fileTags)
-            artifactsPerFileTag[ft] += artifact;
+#if 0
     RulesApplicator(newlyResolvedProduct, artifactsPerFileTag, m_logger).applyAllRules();
-
     addTargetArtifacts(newlyResolvedProduct, artifactsPerFileTag, m_logger);
-
     // parents of removed artifacts must update their transformers
-    foreach (Artifact *removedArtifact, artifactsToRemove)
-        foreach (Artifact *parent, removedArtifact->parents)
+    foreach (Artifact *removedArtifact, artifactsToRemove) {
+        foreach (BuildGraphNode *parentNode, removedArtifact->parents) {
             newlyResolvedProduct->topLevelProject()->buildData->artifactsThatMustGetNewTransformers += parent;
     newlyResolvedProduct->topLevelProject()->buildData->updateNodesThatMustGetNewTransformer(m_logger);
+                continue;
+        }
+    }
+#endif
 
     // delete all removed artifacts physically from the disk
     foreach (Artifact *artifact, artifactsToRemove) {
@@ -682,7 +675,8 @@ void BuildGraphLoader::replaceFileDependencyWithArtifact(const ResolvedProductPt
     foreach (const ResolvedProductPtr &product, fileDepProduct->topLevelProject()->allProducts()) {
         if (!product->buildData)
             continue;
-        foreach (Artifact *artifactInProduct, product->buildData->artifacts) {
+        foreach (BuildGraphNode *nodeInProduct, product->buildData->nodes) {
+            Artifact *artifactInProduct = dynamic_cast<Artifact *>(nodeInProduct);
             if (artifactInProduct->fileDependencies.contains(filedep)) {
                 artifactInProduct->fileDependencies.remove(filedep);
                 loggedConnect(artifactInProduct, artifact, m_logger);
@@ -721,7 +715,8 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore
                                                       "product '%1'").arg(restoredProduct->name);
     }
 
-    foreach (Artifact *artifact, newlyResolvedProduct->buildData->artifacts) {
+    foreach (Artifact *artifact,
+            ArtifactSet::fromNodeSet(newlyResolvedProduct->buildData->nodes)) {
         if (m_logger.traceEnabled()) {
             m_logger.qbsTrace() << QString::fromLocal8Bit("[BG]    artifact '%1'")
                                    .arg(artifact->fileName());
@@ -755,20 +750,5 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore
     }
 }
 
-void addTargetArtifacts(const ResolvedProductPtr &product,
-                        ArtifactsPerFileTagMap &artifactsPerFileTag, const Logger &logger)
-{
-    foreach (const FileTag &fileTag, product->fileTags) {
-        foreach (Artifact * const artifact, artifactsPerFileTag.value(fileTag)) {
-            if (artifact->artifactType == Artifact::Generated)
-                product->buildData->targetArtifacts += artifact;
-        }
-    }
-    if (product->buildData->targetArtifacts.isEmpty()) {
-        const QString msg = QString::fromLocal8Bit("No artifacts generated for product '%1'.");
-        logger.qbsDebug() << msg.arg(product->name);
-    }
-}
-
 } // namespace Internal
 } // namespace qbs