X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=5143dcf77fe0898895918b5588840259a5e39bc7;hb=5cfcbc7507b14df81018f734ae47f92b231b10d2;hp=790a7e33626670ecc6ef546e4bb4e7caaab3191a;hpb=ad88e1ba08cf798e5f87796021c947cf500a02e1;p=builder.git

diff --git a/source/target.h b/source/target.h
index 790a7e3..5143dcf 100644
--- a/source/target.h
+++ b/source/target.h
@@ -14,8 +14,6 @@ class SourcePackage;
 class Task;
 class Tool;
 
-class Target;
-
 /**
 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.
@@ -47,7 +45,6 @@ protected:
 	const Tool *tool;
 	State state;
 	std::string rebuild_reason;
-	std::string install_location;
 
 	Dependencies depends;
 
@@ -60,19 +57,36 @@ public:
 	const SourcePackage *get_package() const { return package; }
 	const Component *get_component() const { return component; }
 
+	/** Adds a dependency for the target.  Order is preseved and is important
+	for some target types.  It is an error to create dependency cycles, although
+	this won't be detected until the targets are prepared. */
+	void add_dependency(Target &);
+
+protected:
+	/** Finds dependencies for the target.  Called during preparation.  If the
+	target needs to recursively inspect its dependencies, it should prepare its
+	direct dependencies first. */
+	virtual void find_dependencies() { }
+
+public:
+	/// Returns the dependencies of the target, in the order they were added.
+	const Dependencies &get_dependencies() const { return depends; }
+
 	/** Tries to locate a target that will help getting this target built.  If
 	all dependencies are up-to-date, returns this target.  If there are no
 	targets ready to be built (maybe because they are being built right now),
 	returns 0. */
 	virtual Target *get_buildable_target();
 
-	/** If this target is a proxy for another (such as Install), return that
-	target.  Otherwise, return the target itself.
-
-	Implementors should call the function recursively to find the final target. */
+	/** If this target is a proxy for another (such as InstalledFile), return
+	that target.  Otherwise, return the target itself.  Implementors should call
+	the function recursively to find the final target. */
 	virtual Target *get_real_target() { return this; }
 
 	void set_tool(const Tool &);
+
+	/** Returns the tool used to build the target.  To actually build it, call
+	the build() function. */
 	const Tool *get_tool() const { return tool; }
 
 	/** Indicates if it's possible to build this target. */
@@ -89,28 +103,29 @@ public:
 	/** Forces rebuild of the target. */
 	void force_rebuild();
 
-	bool is_installable() const { return !install_location.empty(); }
-	const std::string &get_install_location() const { return install_location; }
-	void add_depend(Target *);
-	const Dependencies &get_depends() const { return depends; }
-
-	/** Finds dependencies for the target. */
-	virtual void find_depends() { }
-
-	/** Prepares the target by finding dependencies, recursively preparing them
-	and then checking whether rebuilding is needed. */
-	virtual void prepare();
-
-	/** Starts building the target.  Returns the Action used for building. */
-	Task *build();
 protected:
+	/** Marks the target to be rebuilt and specified a reason for it. */
 	void mark_rebuild(const std::string &);
 
 	/** Checks if the target needs to be rebuilt and why. */
 	virtual void check_rebuild() = 0;
 
+public:
+	/** Prepares the target by finding dependencies, recursively preparing them
+	and then checking whether rebuilding is needed. */
+	void prepare();
+
+	/** Invokes the associated Tool to build the target and returns the
+	resulting Task.  The task must be started by the caller. */
+	virtual Task *build();
+
+protected:
 	/** Handler for Task::signal_finished. */
 	virtual void build_finished(bool);
+
+public:
+	/** Removes any results of building the target. */
+	virtual void clean() { }
 };
 
 #endif