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

diff --git a/source/target.cpp b/source/target.cpp
index 352b788..055abb5 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,6 +1,6 @@
+#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"
@@ -20,7 +20,7 @@ Target::Target(Builder &b, const string &n):
 	state(INIT),
 	primary_target(0)
 {
-	builder.add_target(this);
+	builder.get_build_graph().add_target(this);
 }
 
 void Target::add_dependency(Target &dep)
@@ -32,13 +32,22 @@ void Target::add_dependency(Target &dep)
 		dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
+void Target::add_transitive_dependency(Target &dep)
+{
+	if(&dep==this)
+		throw invalid_argument("Target::add_transitive_dependency");
+	trans_depends.push_back(&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()
@@ -49,12 +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)
 	{
-		Target *tgt = (*i)->get_buildable_target();
+		// Avoid infinite recursion if a target depends on its own side effect
+		if(any_equals(side_effects, d))
+			continue;
+
+		Target *tgt = d->get_buildable_target();
 		if(tgt)
 			return tgt;
-		else if((*i)->needs_rebuild())
+		else if(d->needs_rebuild())
 			self_ok = false;
 	}
 
@@ -64,11 +77,21 @@ Target *Target::get_buildable_target()
 	return 0;
 }
 
-void Target::set_tool(const Tool &t)
+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)
+		binfo.update_from(package->get_build_info());
 }
 
 void Target::force_rebuild()
@@ -86,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();
 }
@@ -97,42 +120,62 @@ void Target::prepare()
 		return;
 	if(state==PREPARING)
 	{
-		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+		builder.get_logger().log("problems", "Dependency cycle detected at %s", 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();
+	for(Target *d: depends)
+	{
+		d->prepare();
+		broken |= d->is_broken();
+	}
+	for(Target *d: trans_depends)
+		d->prepare();
 
 	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)
-		(*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()
 {
-	if(!tool)
-	{
-		// This special case is needed for VirtualTargets
-		state = UPTODATE;
-		return 0;
-	}
+	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(Target *s: side_effects)
+		s->build(*task);
+
 	return task;
 }
 
@@ -142,7 +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();
 	}
 }