X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=03b87557873e111a2b0eb986b90fb97b1cbe959a;hb=243d7c7355c1c5d9a0134440f340936325caaf88;hp=2c14ea1ae3064ef394e0bcff951dafddf8360b61;hpb=4f5571c3098953378253234b476a5a2b07974065;p=builder.git

diff --git a/source/target.h b/source/target.h
index 2c14ea1..03b8755 100644
--- a/source/target.h
+++ b/source/target.h
@@ -8,6 +8,7 @@
 #include <msp/time/timestamp.h>
 
 class Builder;
+class Component;
 class Package;
 class Task;
 class Tool;
@@ -24,85 +25,75 @@ public:
 	typedef std::list<Target *> Dependencies;
 
 protected:
+	enum State
+	{
+		INIT,
+		PREPARING,
+		REBUILD,
+		BUILDING,
+		UPTODATE
+	};
+
 	Builder &builder;
 	const Package *package;
+	const Component *component;
 	std::string name;
 
 	const Tool *tool;
-	bool building;
-	bool rebuild;
+	State state;
 	std::string rebuild_reason;
 	std::string install_location;
 
 	Dependencies depends;
-	bool deps_ready;
-
-	bool preparing;
-	bool prepared;
 
-	Target(Builder &, const Package *, const std::string &);
+	Target(Builder &, const std::string &);
 public:
 	virtual ~Target() { }
 
 	virtual const char *get_type() const = 0;
 	const std::string &get_name() const { return name; }
 	const Package *get_package() const { return package; }
+	const Component *get_component() const { return component; }
 
-	/**
-	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.
-	*/
+	/** 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 or Symlink), return
-	that target.  Otherwise, return the target itself.
+	/** 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.
-	*/
+	Implementors should call the function recursively to find the final target. */
 	virtual Target *get_real_target() { return this; }
 
 	void set_tool(const Tool &);
 	const Tool *get_tool() const { return tool; }
 
 	bool is_buildable() const { return tool!=0; }
-	bool needs_rebuild() const { return rebuild; }
+	bool needs_rebuild() const { return state>PREPARING && state<UPTODATE; }
 	const std::string &get_rebuild_reason() const { return rebuild_reason; }
 	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; }
-	bool get_depends_ready() const { return deps_ready; }
-
-	/**
-	Finds dependencies for the target.  When all dependencies have been found,
-	the function should set deps_ready to true.
-	*/
-	virtual void find_depends() { deps_ready = true; }
-
-	/**
-	Prepares the target by recursively preparing dependencies, then checking
-	whether rebuilding is needed.  A flag is used to prevent unnecessary
-	executions.
-	*/
+
+	/** 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.
-	*/
+	/** Starts building the target.  Returns the Action used for building. */
 	Task *build();
 protected:
 	void mark_rebuild(const std::string &);
 
-	/**
-	Checks if the target needs to be rebuilt and why.
-	*/
+	/** Checks if the target needs to be rebuilt and why. */
 	virtual void check_rebuild() = 0;
 
-	/**
-	Handler for the build_finished signal of Task.
-	*/
+	/** Handler for Task::signal_finished. */
 	virtual void build_finished(bool);
 };