X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=577438b3528dce736aa3c22077e0857a24f5a0b4;hb=353f5d442804296ad5c8d457fd60d55756a57fba;hp=44a758f888d152e543b9c489904760d3dd070dd3;hpb=c01dc113eca278100ad0b4572082da619d52662e;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 44a758f..577438b 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,8 +1,9 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "task.h"
 #include "tool.h"
@@ -47,11 +48,20 @@ void Target::set_tool(const Tool &t)
 	tool = &t;
 }
 
-void Target::add_depend(Target *dep)
+void Target::force_rebuild()
 {
-	if(dep==this)
+	if(!is_buildable())
+		throw logic_error("Target::force_rebuild");
+	mark_rebuild("Forced rebuild");
+}
+
+void Target::add_depend(Target &dep)
+{
+	if(&dep==this)
 		throw invalid_argument("Target::add_depend");
-	depends.push_back(dep);
+	depends.push_back(&dep);
+	if(state>PREPARING)
+		dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 void Target::prepare()
@@ -66,6 +76,11 @@ void Target::prepare()
 
 	state = PREPARING;
 	find_depends();
+	if(tool)
+	{
+		if(FileTarget *tool_exe = tool->get_executable())
+			add_depend(*tool_exe);
+	}
 
 	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
@@ -73,12 +88,16 @@ void Target::prepare()
 	check_rebuild();
 	if(state==PREPARING)
 		state = UPTODATE;
+
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+		(*i)->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Task *Target::build()
 {
 	if(!tool)
 	{
+		// This special case is needed for VirtualTargets
 		state = UPTODATE;
 		return 0;
 	}
@@ -95,10 +114,17 @@ Task *Target::build()
 	return task;
 }
 
-void Target::mark_rebuild(const std::string &reason)
+void Target::mark_rebuild(const string &reason)
 {
+	if(reason.empty())
+		throw invalid_argument("No reason given for rebuilding "+name);
+
 	state = REBUILD;
 	rebuild_reason = reason;
+
+	builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+
+	signal_bubble_rebuild.emit();
 }
 
 void Target::build_finished(bool /*success*/)