Use shortcut functions for find calls

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 7f031ec2dd384a1b86e0e4f61f7797d4f0803798..b741705e4d34193276e8c642c344668a45f45ecd 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -32,13 +33,22 @@ 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);
-       se.add_dependency(*this);
        if(tool)
                se.set_tool(*tool);
        se.primary_target = this;
+       /* Side effects are checked for rebuild after the primary target.  Recheck
+       the primary if a side effect is marked for rebuild. */
+       se.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Target *Target::get_buildable_target()
@@ -49,12 +59,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)
        {
-               Target *tgt = (*i)->get_buildable_target();
+               // Avoid infinite recursion if a target repends on its own side effect
+               if(any_equals(side_effects, d))
+                       continue;
+
+               Target *tgt = d->get_buildable_target();
                if(tgt)
                        return tgt;
-               else if((*i)->needs_rebuild())
+               else if(d->needs_rebuild())
                        self_ok = false;
        }
 
@@ -67,8 +81,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()
@@ -97,6 +121,7 @@ void Target::prepare()
                return;
        if(state==PREPARING)
        {
+               builder.get_logger().log("problems", format("Dependency cycle detected at %s", name));
                problems.push_back("Dependency cycle detected");
                state = BROKEN;
                return;
@@ -121,11 +146,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)
@@ -133,16 +160,23 @@ 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()
 {
+       if(primary_target)
+               return primary_target->build();
+
        Task *task = tool->run(*this);
        task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
        state = BUILDING;
 
+       build(*task);
+       for(Target *s: side_effects)
+               s->build(*task);
+
        return task;
 }
 
@@ -152,7 +186,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();
        }
 }