Prepare early dependencies of a target before finding more

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index b741705e4d34193276e8c642c344668a45f45ecd..dbdd950e4a3bd7570c920b6122b0ee3cfcecf3e2 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,7 +1,6 @@
 #include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
@@ -14,12 +13,7 @@ using namespace Msp;
 
 Target::Target(Builder &b, const string &n):
        builder(b),
-       package(0),
-       component(0),
-       name(n),
-       tool(0),
-       state(INIT),
-       primary_target(0)
+       name(n)
 {
        builder.get_build_graph().add_target(this);
 }
@@ -61,7 +55,7 @@ Target *Target::get_buildable_target()
        bool self_ok = state!=BUILDING;
        for(Target *d: depends)
        {
-               // Avoid infinite recursion if a target repends on its own side effect
+               // Avoid infinite recursion if a target depends on its own side effect
                if(any_equals(side_effects, d))
                        continue;
 
@@ -110,7 +104,7 @@ void Target::mark_rebuild(const string &reason)
        state = REBUILD;
        rebuild_reason = reason;
 
-       builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+       builder.get_logger().log("rebuild", "Rebuilding %s: %s", name, reason);
 
        signal_bubble_rebuild.emit();
 }
@@ -121,13 +115,17 @@ void Target::prepare()
                return;
        if(state==PREPARING)
        {
-               builder.get_logger().log("problems", format("Dependency cycle detected at %s", name));
+               builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
                problems.push_back("Dependency cycle detected");
                state = BROKEN;
                return;
        }
 
        state = PREPARING;
+       /* Prepare existing dependencies early, because their information may be
+       needed to find other dependencies. */
+       for(Target *d: depends)
+               d->prepare();
        if(tool)
                tool->prepare();
 
@@ -146,6 +144,8 @@ void Target::prepare()
                broken |= (component && !component->get_problems().empty());
        }
 
+       /* Now that all dependencies are known, prepare them again.  This will do
+       nothing to already prepared targets. */
        for(Target *d: depends)
        {
                d->prepare();