Process paths after merging build info

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 87b0d0078e16bcb565898c55ba6923e807b328c1..dd75e9a4a98b4d18206a8e7cf7c1512746557902 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -39,6 +39,9 @@ void Target::add_side_effect(Target &se)
        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()
@@ -97,23 +100,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)
@@ -122,10 +142,17 @@ void Target::prepare()
 
 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(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+               (*i)->build(*task);
+
        return task;
 }