Refactor transitive dependencies to work on all targets

[builder.git] / source / lib / target.h

diff --git a/source/lib/target.h b/source/lib/target.h
index 0ba38f82031b06122aa10c001f222e0bbf143c49..c6c8baa89d6e5046001afbf4ffb8c3c628316e99 100644 (file)
--- a/source/lib/target.h
+++ b/source/lib/target.h
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 #include <sigc++/signal.h>
+#include <msp/core/noncopyable.h>
 #include <msp/time/timestamp.h>
 #include "libbuilder_api.h"
 
@@ -41,6 +42,12 @@ protected:
                BROKEN
        };
 
+       struct PushPrepare: Msp::NonCopyable
+       {
+               PushPrepare(Target *t) { prepare_stack.push_back(t); }
+               ~PushPrepare() { prepare_stack.pop_back(); }
+       };
+
 public:
        sigc::signal<void> signal_bubble_rebuild;
        sigc::signal<void> signal_modified;
@@ -60,6 +67,9 @@ protected:
        Dependencies trans_depends;
        Dependencies side_effects;
        Target *primary_target = 0;
+       bool rescan_trans_deps = false;
+
+       static std::vector<Target *> prepare_stack;
 
        Target(Builder &, const std::string &);
 public:
@@ -87,6 +97,13 @@ protected:
        direct dependencies first. */
        virtual void find_dependencies() { }
 
+private:
+       bool find_transitive_dependencies();
+       void find_transitive_dependencies(Target &, std::vector<Target *> &) const;
+
+protected:
+       virtual Target *resolve_transitive_dependency(Target &, Target &dep) const { return &dep; }
+
 public:
        /// Returns the dependencies of the target, in the order they were added.
        const Dependencies &get_dependencies() const { return depends; }