Store problems at their source rather than globally

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index a9ad8e7063931006a3a6b3ba5de961a6d1f33fdf..7f031ec2dd384a1b86e0e4f61f7797d4f0803798 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -64,7 +64,7 @@ Target *Target::get_buildable_target()
        return 0;
 }
 
-void Target::set_tool(const Tool &t)
+void Target::set_tool(Tool &t)
 {
        tool = &t;
        for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
@@ -97,23 +97,40 @@ void Target::prepare()
                return;
        if(state==PREPARING)
        {
-               builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+               problems.push_back("Dependency cycle detected");
+               state = BROKEN;
                return;
        }
 
        state = PREPARING;
+       if(tool)
+               tool->prepare();
+
        find_dependencies();
+       bool broken = !problems.empty();
+
        if(tool)
        {
                if(FileTarget *tool_exe = tool->get_executable())
                        add_dependency(*tool_exe);
+               broken |= !tool->get_problems().empty();
+
+               // Only check package and component problems for buildable targets
+               // XXX How to propagate nested package problems?
+               broken |= (package && !package->get_problems().empty());
+               broken |= (component && !component->get_problems().empty());
        }
 
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       {
                (*i)->prepare();
+               broken |= (*i)->is_broken();
+       }
 
        check_rebuild();
-       if(state==PREPARING)
+       if(broken)
+               state = BROKEN;
+       else if(state==PREPARING)
                state = UPTODATE;
 
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)