Move file-to-target mapping to a separate class

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index edfd60cebe7f8f655a5c8011512d05b80b481d9b..48bd7e4438502e466d2c34770b408e7bb55765ea 100644 (file)
--- 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,9 +7,10 @@ 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;
@@ -32,6 +26,7 @@ protected:
        const Package *package;
        std::string name;
 
+       const Tool *tool;
        bool buildable;
        bool building;
        bool rebuild;
@@ -56,7 +51,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,6 +61,9 @@ 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; }
@@ -89,7 +87,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 +97,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