X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=a47eb756f868cc0663939f7d255c6b31f3f15d8d;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=edfd60cebe7f8f655a5c8011512d05b80b481d9b;hpb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;p=builder.git

diff --git a/source/target.h b/source/target.h
index edfd60c..a47eb75 100644
--- a/source/target.h
+++ b/source/target.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef TARGET_H_
 #define TARGET_H_
 
@@ -14,12 +7,12 @@ Distributed under the LGPL
 #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
@@ -27,17 +20,21 @@ handles many common tasks.  See also FileTarget and VirtualTarget.
 */
 class Target
 {
+public:
+	typedef std::list<Target *> Dependencies;
+
 protected:
 	Builder &builder;
 	const Package *package;
 	std::string name;
 
+	const Tool *tool;
 	bool buildable;
 	bool building;
 	bool rebuild;
 	std::string rebuild_reason;
 
-	TargetList depends;
+	Dependencies depends;
 	bool deps_ready;
 
 	bool preparing;
@@ -56,7 +53,7 @@ public:
 	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.
 	*/
-	Target *get_buildable_target();
+	virtual Target *get_buildable_target();
 
 	/**
 	If this target is a proxy for another (such as Install or Symlink), return
@@ -66,11 +63,14 @@ public:
 	*/
 	virtual Target *get_real_target() { return this; }
 
+	void set_tool(const Tool &);
+	const Tool *get_tool() const { return tool; }
+
 	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 *);
-	const TargetList &get_depends() const { return depends; }
+	const Dependencies &get_depends() const { return depends; }
 	bool get_depends_ready() const { return deps_ready; }
 
 	/**
@@ -89,7 +89,7 @@ public:
 	/**
 	Starts building the target.  Returns the Action used for building.
 	*/
-	Action *build();
+	Task *build();
 protected:
 	void mark_rebuild(const std::string &);
 
@@ -99,16 +99,9 @@ protected:
 	virtual void check_rebuild() = 0;
 
 	/**
-	Creates and returns an Action suitable for building this target.
+	Handler for the build_finished signal of Task.
 	*/
-	virtual Action *create_action() =0;
-
-	/**
-	Handler for the build_done signal of Action.
-	*/
-	virtual void build_done();
+	virtual void build_finished(bool);
 };
 
-typedef std::map<std::string, Target *> TargetMap;
-
 #endif