From 006824f89c4f298f19c45f4f4585b4452cd2d2b9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 2 Aug 2013 13:57:26 +0200 Subject: introduce class BuildGraphNode 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 --- src/lib/buildgraph/productbuilddata.h | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'src/lib/buildgraph/productbuilddata.h') diff --git a/src/lib/buildgraph/productbuilddata.h b/src/lib/buildgraph/productbuilddata.h index 53d68ad0d..533f9ebaa 100644 --- a/src/lib/buildgraph/productbuilddata.h +++ b/src/lib/buildgraph/productbuilddata.h @@ -29,9 +29,10 @@ #ifndef QBS_PRODUCTBUILDDATA_H #define QBS_PRODUCTBUILDDATA_H -#include "artifactlist.h" +#include "artifactset.h" +#include "nodeset.h" +#include #include - #include #include @@ -39,6 +40,7 @@ namespace qbs { namespace Internal { + class Logger; class ProductBuildData : public PersistentObject @@ -46,15 +48,34 @@ class ProductBuildData : public PersistentObject public: ~ProductBuildData(); - QSet targetArtifacts; - ArtifactList artifacts; + ArtifactSet targetArtifacts; + NodeSet nodes; + NodeSet roots; QList topSortedRules; // Do not store, initialized in executor. Higher prioritized artifacts are built first. unsigned int buildPriority; + void registerAddedFileTag(const FileTag &fileTag, Artifact *artifact); + void registerAddedArtifact(Artifact *artifact); + void registerRemovedFileTag(const FileTag &fileTag, Artifact *artifact); + void registerRemovedArtifact(Artifact *artifact); + const ArtifactSet addedArtifactsByFileTag(const FileTag &tag) const; + const ArtifactSet removedArtifactsByFileTag(const FileTag &tag) const; + + // ### HACK + QHash addedArtifacts() const { return m_addedArtifactsByFileTag; } + void setAddedArtifacts(const QHash &asfdjkl) { m_addedArtifactsByFileTag = asfdjkl; } + // ### END OF HACK + + void load(PersistentPool &pool); void store(PersistentPool &pool) const; + +private: + typedef QHash ArtifactSetByFileTag; + ArtifactSetByFileTag m_addedArtifactsByFileTag; + ArtifactSetByFileTag m_removedArtifactsByFileTag; }; } // namespace Internal -- cgit v1.2.1