Use default member initializers and constructor delegation

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 72a369ad0d4a15332116ee0527e75d88030b4ebf..d701859524b19ef662e8e6178ef352a011c2e7cb 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,7 +1,6 @@
-#include <algorithm>
+#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);
 }
@@ -33,6 +27,13 @@ void Target::add_dependency(Target &dep)
                dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
+void Target::add_transitive_dependency(Target &dep)
+{
+       if(&dep==this)
+               throw invalid_argument("Target::add_transitive_dependency");
+       trans_depends.push_back(&dep);
+}
+
 void Target::add_side_effect(Target &se)
 {
        side_effects.push_back(&se);
@@ -52,16 +53,16 @@ Target *Target::get_buildable_target()
                return 0;
 
        bool self_ok = state!=BUILDING;
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Target *d: depends)
        {
-               // Avoid infinite recursion if a target repends on its own side effect
-               if(find(side_effects.begin(), side_effects.end(), *i)!=side_effects.end())
+               // Avoid infinite recursion if a target depends on its own side effect
+               if(any_equals(side_effects, d))
                        continue;
 
-               Target *tgt = (*i)->get_buildable_target();
+               Target *tgt = d->get_buildable_target();
                if(tgt)
                        return tgt;
-               else if((*i)->needs_rebuild())
+               else if(d->needs_rebuild())
                        self_ok = false;
        }
 
@@ -74,8 +75,18 @@ Target *Target::get_buildable_target()
 void Target::set_tool(Tool &t)
 {
        tool = &t;
-       for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-               (*i)->set_tool(t);
+       for(Target *s: side_effects)
+               s->set_tool(t);
+}
+
+void Target::collect_build_info(BuildInfo &binfo) const
+{
+       if(tool)
+               binfo.update_from(tool->get_build_info());
+       if(component)
+               binfo.update_from(component->get_build_info());
+       else if(package)
+               binfo.update_from(package->get_build_info());
 }
 
 void Target::force_rebuild()
@@ -93,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();
 }
@@ -104,6 +115,7 @@ void Target::prepare()
                return;
        if(state==PREPARING)
        {
+               builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
                problems.push_back("Dependency cycle detected");
                state = BROKEN;
                return;
@@ -128,11 +140,13 @@ void Target::prepare()
                broken |= (component && !component->get_problems().empty());
        }
 
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Target *d: depends)
        {
-               (*i)->prepare();
-               broken |= (*i)->is_broken();
+               d->prepare();
+               broken |= d->is_broken();
        }
+       for(Target *d: trans_depends)
+               d->prepare();
 
        check_rebuild();
        if(broken)
@@ -140,8 +154,8 @@ void Target::prepare()
        else if(state==PREPARING)
                state = UPTODATE;
 
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
-               (*i)->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+       for(Target *d: depends)
+               d->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Task *Target::build()
@@ -154,8 +168,8 @@ Task *Target::build()
        state = BUILDING;
 
        build(*task);
-       for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-               (*i)->build(*task);
+       for(Target *s: side_effects)
+               s->build(*task);
 
        return task;
 }
@@ -166,7 +180,8 @@ void Target::build_finished(bool success)
        if(success)
        {
                modified();
-               for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-                       (*i)->build_finished(success);
+               for(Target *s: side_effects)
+                       s->build_finished(success);
+               signal_modified.emit();
        }
 }