X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=055abb56982203e6645873d10b428dae8e3e488f;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=7c5532f9f8200daca4859cedaa51682a138a9a10;hpb=3f0f7216789aeedba206308c452623351e406e75;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 7c5532f..055abb5 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,7 +1,6 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
@@ -59,16 +58,16 @@ Target *Target::get_buildable_target()
 		return 0;
 
 	bool self_ok = state!=BUILDING;
-	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Target *d: depends)
 	{
-		// Avoid infinite recursion if a target repends on its own side effect
-		if(find(side_effects.begin(), side_effects.end(), *i)!=side_effects.end())
+		// Avoid infinite recursion if a target depends on its own side effect
+		if(any_equals(side_effects, d))
 			continue;
 
-		Target *tgt = (*i)->get_buildable_target();
+		Target *tgt = d->get_buildable_target();
 		if(tgt)
 			return tgt;
-		else if((*i)->needs_rebuild())
+		else if(d->needs_rebuild())
 			self_ok = false;
 	}
 
@@ -81,12 +80,14 @@ Target *Target::get_buildable_target()
 void Target::set_tool(Tool &t)
 {
 	tool = &t;
-	for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-		(*i)->set_tool(t);
+	for(Target *s: side_effects)
+		s->set_tool(t);
 }
 
 void Target::collect_build_info(BuildInfo &binfo) const
 {
+	if(tool)
+		binfo.update_from(tool->get_build_info());
 	if(component)
 		binfo.update_from(component->get_build_info());
 	else if(package)
@@ -108,7 +109,7 @@ void Target::mark_rebuild(const string &reason)
 	state = REBUILD;
 	rebuild_reason = reason;
 
-	builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+	builder.get_logger().log("rebuild", "Rebuilding %s: %s", name, reason);
 
 	signal_bubble_rebuild.emit();
 }
@@ -119,6 +120,7 @@ void Target::prepare()
 		return;
 	if(state==PREPARING)
 	{
+		builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
 		problems.push_back("Dependency cycle detected");
 		state = BROKEN;
 		return;
@@ -143,13 +145,13 @@ void Target::prepare()
 		broken |= (component && !component->get_problems().empty());
 	}
 
-	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Target *d: depends)
 	{
-		(*i)->prepare();
-		broken |= (*i)->is_broken();
+		d->prepare();
+		broken |= d->is_broken();
 	}
-	for(Dependencies::iterator i=trans_depends.begin(); i!=trans_depends.end(); ++i)
-		(*i)->prepare();
+	for(Target *d: trans_depends)
+		d->prepare();
 
 	check_rebuild();
 	if(broken)
@@ -157,8 +159,8 @@ void Target::prepare()
 	else 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));
+	for(Target *d: depends)
+		d->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Task *Target::build()
@@ -171,8 +173,8 @@ Task *Target::build()
 	state = BUILDING;
 
 	build(*task);
-	for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-		(*i)->build(*task);
+	for(Target *s: side_effects)
+		s->build(*task);
 
 	return task;
 }
@@ -183,8 +185,8 @@ void Target::build_finished(bool success)
 	if(success)
 	{
 		modified();
-		for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-			(*i)->build_finished(success);
+		for(Target *s: side_effects)
+			s->build_finished(success);
 		signal_modified.emit();
 	}
 }