Move the Component reference to Target and make it a pointer

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 891d75752396471978048d65cb7ffefc2f49cecf..d0e68f50588da69decb51b556dd633be63529c05 100644 (file)
--- 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,30 +25,36 @@ 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 buildable;
-       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
@@ -67,8 +74,8 @@ public:
        void set_tool(const Tool &);
        const Tool *get_tool() const { return tool; }
 
-       bool is_buildable() const { return buildable; }
-       bool get_rebuild() const { return rebuild; }
+       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; }