Add logging for some problem situations

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index dd75e9a4a98b4d18206a8e7cf7c1512746557902..9006a570cb360f42c00589bd08abc7e54b25ca05 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -32,10 +33,16 @@ 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;
@@ -54,6 +61,10 @@ Target *Target::get_buildable_target()
        bool self_ok = state!=BUILDING;
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
+               // Avoid infinite recursion if a target repends on its own side effect
+               if(find(side_effects.begin(), side_effects.end(), *i)!=side_effects.end())
+                       continue;
+
                Target *tgt = (*i)->get_buildable_target();
                if(tgt)
                        return tgt;
@@ -74,6 +85,16 @@ void Target::set_tool(Tool &t)
                (*i)->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()
 {
        if(!is_buildable())
@@ -100,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;
@@ -129,6 +151,8 @@ void Target::prepare()
                (*i)->prepare();
                broken |= (*i)->is_broken();
        }
+       for(Dependencies::iterator i=trans_depends.begin(); i!=trans_depends.end(); ++i)
+               (*i)->prepare();
 
        check_rebuild();
        if(broken)
@@ -164,5 +188,6 @@ void Target::build_finished(bool success)
                modified();
                for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
                        (*i)->build_finished(success);
+               signal_modified.emit();
        }
 }