X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=04c3c09a3648876578e8b7e7794e64bb3e9b6bd5;hb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;hp=d971a55bbd46f7dd8a444903a3477c69c02a8a2b;hpb=a176997a1377cf8260ab362d9df8f975035da0f5;p=builder.git

diff --git a/source/target.h b/source/target.h
index d971a55..04c3c09 100644
--- a/source/target.h
+++ b/source/target.h
@@ -7,12 +7,12 @@
 #include <string>
 #include <msp/time/timestamp.h>
 
-class Action;
 class Builder;
 class Package;
+class Task;
+class Tool;
 
 class Target;
-typedef std::list<Target *> TargetList;
 
 /**
 Targets make up the build graph.  This class is a base for all target types and
@@ -20,22 +20,31 @@ handles many common tasks.  See also FileTarget and VirtualTarget.
 */
 class Target
 {
+public:
+	typedef std::list<Target *> Dependencies;
+
 protected:
+	enum State
+	{
+		INIT,
+		PREPARING,
+		REBUILD,
+		BUILDING,
+		UPTODATE
+	};
+
 	Builder &builder;
 	const Package *package;
 	std::string name;
 
-	bool buildable;
-	bool building;
-	bool rebuild;
+	const Tool *tool;
+	State state;
 	std::string rebuild_reason;
+	std::string install_location;
 
-	TargetList depends;
+	Dependencies depends;
 	bool deps_ready;
 
-	bool preparing;
-	bool prepared;
-
 	Target(Builder &, const Package *, const std::string &);
 public:
 	virtual ~Target() { }
@@ -59,11 +68,16 @@ public:
 	*/
 	virtual Target *get_real_target() { return this; }
 
-	bool is_buildable() const { return buildable; }
-	bool get_rebuild() const { return rebuild; }
+	void set_tool(const Tool &);
+	const Tool *get_tool() const { return tool; }
+
+	bool is_buildable() const { return tool!=0; }
+	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 TargetList &get_depends() const { return depends; }
+	const Dependencies &get_depends() const { return depends; }
 	bool get_depends_ready() const { return deps_ready; }
 
 	/**
@@ -82,7 +96,7 @@ public:
 	/**
 	Starts building the target.  Returns the Action used for building.
 	*/
-	Action *build();
+	Task *build();
 protected:
 	void mark_rebuild(const std::string &);
 
@@ -92,14 +106,9 @@ protected:
 	virtual void check_rebuild() = 0;
 
 	/**
-	Creates and returns an Action suitable for building this target.
-	*/
-	virtual Action *create_action() =0;
-
-	/**
-	Handler for the build_done signal of Action.
+	Handler for the build_finished signal of Task.
 	*/
-	virtual void build_done();
+	virtual void build_finished(bool);
 };
 
 #endif