Support conditionals inside components

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index b0273e9ff535d9a5a80d0d6ecee5948245298b8c..691f70038e932bb79df4f71567cd72eb1f197899 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -17,12 +17,13 @@ Target::Target(Builder &b, const string &n):
        component(0),
        name(n),
        tool(0),
-       state(INIT)
+       state(INIT),
+       primary_target(0)
 {
-       builder.add_target(this);
+       builder.get_build_graph().add_target(this);
 }
 
-void Target::add_depend(Target &dep)
+void Target::add_dependency(Target &dep)
 {
        if(&dep==this)
                throw invalid_argument("Target::add_depend");
@@ -31,8 +32,19 @@ void Target::add_depend(Target &dep)
                dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
+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;
+}
+
 Target *Target::get_buildable_target()
 {
+       if(primary_target)
+               return primary_target->get_buildable_target();
        if(!needs_rebuild())
                return 0;
 
@@ -55,6 +67,8 @@ Target *Target::get_buildable_target()
 void Target::set_tool(const Tool &t)
 {
        tool = &t;
+       for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+               (*i)->set_tool(t);
 }
 
 void Target::force_rebuild()
@@ -88,11 +102,11 @@ void Target::prepare()
        }
 
        state = PREPARING;
-       find_depends();
+       find_dependencies();
        if(tool)
        {
                if(FileTarget *tool_exe = tool->get_executable())
-                       add_depend(*tool_exe);
+                       add_dependency(*tool_exe);
        }
 
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -115,11 +129,6 @@ Task *Target::build()
                return 0;
        }
 
-       // XXX Minor breach of OO here
-       if(FileTarget *ft = dynamic_cast<FileTarget *>(this))
-               if(!builder.get_dry_run() && FS::exists(ft->get_path()))
-                       FS::unlink(ft->get_path());
-
        Task *task = tool->run(*this);
        task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
        state = BUILDING;
@@ -127,7 +136,13 @@ Task *Target::build()
        return task;
 }
 
-void Target::build_finished(bool /*success*/)
+void Target::build_finished(bool success)
 {
        state = UPTODATE;
+       if(success)
+       {
+               modified();
+               for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+                       (*i)->build_finished(success);
+       }
 }