Fix some problems with side effect dependencies

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 7f031ec2dd384a1b86e0e4f61f7797d4f0803798..72a369ad0d4a15332116ee0527e75d88030b4ebf 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>
@@ -35,10 +36,12 @@ void Target::add_dependency(Target &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()
@@ -51,6 +54,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;
@@ -139,10 +146,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;
 }