X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=01b115a7a6b5ddf2e008f39299c7c392ae84bcd2;hb=20994a6f4802f2dbcf01888d0e1996edf554ade5;hp=5deb2344b3c00ed72d6253ad0d294d502ba25a89;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/target.h b/source/target.h
index 5deb234..01b115a 100644
--- a/source/target.h
+++ b/source/target.h
@@ -10,6 +10,7 @@ Distributed under the LGPL
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <msp/time/timestamp.h>
 
@@ -22,7 +23,7 @@ typedef std::list<Target *> TargetList;
 
 /**
 Targets make up the build graph.  This class is a base for all target types and
-handles many common tasks.  Most targets are associated with a file.
+handles many common tasks.  See also FileTarget and VirtualTarget.
 */
 class Target
 {
@@ -30,7 +31,6 @@ protected:
 	Builder &builder;
 	const Package *package;
 	std::string name;
-	Msp::Time::TimeStamp mtime;
 
 	bool buildable;
 	bool building;
@@ -38,20 +38,18 @@ protected:
 	std::string rebuild_reason;
 
 	TargetList depends;
-	TargetList rdepends;
 	bool deps_ready;
 
+	bool preparing;
 	bool prepared;
-	bool counted;
 
 	Target(Builder &, const Package *, const std::string &);
 public:
 	virtual ~Target() { }
 
-	virtual const char *get_type() const=0;
+	virtual const char *get_type() const = 0;
 	const std::string &get_name() const { return name; }
 	const Package *get_package() const { return package; }
-	const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
 
 	/**
 	Tries to locate a target that will help getting this target built.  If all
@@ -60,7 +58,7 @@ public:
 	*/
 	Target *get_buildable_target();
 
-	bool get_buildable() const { return buildable; }
+	bool is_buildable() const { return buildable; }
 	bool get_rebuild() const { return rebuild; }
 	const std::string &get_rebuild_reason() const { return rebuild_reason; }
 	void add_depend(Target *);
@@ -71,7 +69,7 @@ public:
 	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; }
+	virtual void find_depends() { deps_ready = true; }
 
 	/**
 	Prepares the target by recursively preparing dependencies, then checking
@@ -84,26 +82,13 @@ public:
 	Starts building the target.  Returns the Action used for building.
 	*/
 	Action *build();
-
-	void reset_count() { counted=false; }
-
-	/**
-	Returns the number of targets that need to be rebuilt in order to get this
-	target up-to-date.
-	*/
-	virtual unsigned count_rebuild();
-
-	/**
-	Changes the mtime of the target to the current time.
-	*/
-	void touch();
 protected:
 	void mark_rebuild(const std::string &);
 
 	/**
 	Checks if the target needs to be rebuilt and why.
 	*/
-	virtual void check_rebuild();
+	virtual void check_rebuild() = 0;
 
 	/**
 	Creates and returns an Action suitable for building this target.
@@ -111,7 +96,7 @@ protected:
 	virtual Action *create_action() =0;
 
 	/**
-	Handles for the build_done signal of Action.
+	Handler for the build_done signal of Action.
 	*/
 	virtual void build_done();
 };