X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=6ef6457a0f5fe73d70ddc31d7f66b561e878b63b;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=6b9cc90a0842de77c845982a1f6462d7c107caf6;hpb=24981eb7ef702aa97b2ab90399ccd3fc23ce9ccf;p=builder.git

diff --git a/source/target.h b/source/target.h
index 6b9cc90..6ef6457 100644
--- a/source/target.h
+++ b/source/target.h
@@ -1,14 +1,15 @@
 #ifndef TARGET_H_
 #define TARGET_H_
 
-#include <list>
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 #include <sigc++/signal.h>
 #include <msp/time/timestamp.h>
 
 class Builder;
+class BuildInfo;
 class Component;
 class SourcePackage;
 class Task;
@@ -17,11 +18,16 @@ class Tool;
 /**
 Targets make up the build graph.  This class is a base for all target types and
 handles many common tasks.  See also FileTarget and VirtualTarget.
+
+Targets can depend on other targets.  There are two kinds of dependencies:
+normal and transitive.  Normal dependencies will need to be built before the
+target itself, and will cause the target to be rebuilt if modified.  Transitive
+dependencies can be used by other targets further down the chain.
 */
 class Target
 {
 public:
-	typedef std::list<Target *> Dependencies;
+	using Dependencies = std::vector<Target *>;
 
 protected:
 	enum State
@@ -36,21 +42,23 @@ protected:
 
 public:
 	sigc::signal<void> signal_bubble_rebuild;
+	sigc::signal<void> signal_modified;
 
 protected:
 	Builder &builder;
-	const SourcePackage *package;
-	const Component *component;
+	const SourcePackage *package = 0;
+	const Component *component = 0;
 	std::string name;
 
-	Tool *tool;
-	State state;
+	Tool *tool = 0;
+	State state = INIT;
 	std::string rebuild_reason;
-	std::list<std::string> problems;
+	std::vector<std::string> problems;
 
 	Dependencies depends;
+	Dependencies trans_depends;
 	Dependencies side_effects;
-	Target *primary_target;
+	Target *primary_target = 0;
 
 	Target(Builder &, const std::string &);
 public:
@@ -66,6 +74,8 @@ public:
 	this won't be detected until the targets are prepared. */
 	void add_dependency(Target &);
 
+	void add_transitive_dependency(Target &);
+
 	/** Adds a side effect for the target.  Side effects are not built on their
 	own, but together with their primary target. */
 	void add_side_effect(Target &);
@@ -80,6 +90,8 @@ public:
 	/// Returns the dependencies of the target, in the order they were added.
 	const Dependencies &get_dependencies() const { return depends; }
 
+	const Dependencies &get_transitive_dependencies() const { return trans_depends; }
+
 	/// Returns the side effects of the target.
 	const Dependencies &get_side_effects() const { return side_effects; }
 
@@ -103,6 +115,8 @@ public:
 	the build() function. */
 	const Tool *get_tool() const { return tool; }
 
+	virtual void collect_build_info(BuildInfo &) const;
+
 	/** Indicates if it's possible to build this target. */
 	bool is_buildable() const { return tool!=0; }
 
@@ -127,7 +141,7 @@ protected:
 public:
 	bool is_broken() const { return state==BROKEN; }
 
-	const std::list<std::string> &get_problems() const { return problems; }
+	const std::vector<std::string> &get_problems() const { return problems; }
 
 	/** Prepares the target by finding dependencies, recursively preparing them
 	and then checking whether rebuilding is needed. */