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

diff --git a/source/target.cpp b/source/target.cpp
index 352b788..9006a57 100644
--- 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>
@@ -20,7 +21,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 +33,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()
@@ -51,6 +61,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;
@@ -64,13 +78,23 @@ 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);
 }
 
+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()
 {
 	if(!is_buildable())
@@ -97,23 +121,43 @@ void Target::prepare()
 		return;
 	if(state==PREPARING)
 	{
-		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+		builder.get_logger().log("problems", format("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();
+		broken |= (*i)->is_broken();
+	}
+	for(Dependencies::iterator i=trans_depends.begin(); i!=trans_depends.end(); ++i)
 		(*i)->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)
@@ -122,17 +166,17 @@ void Target::prepare()
 
 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(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+		(*i)->build(*task);
+
 	return task;
 }
 
@@ -144,5 +188,6 @@ void Target::build_finished(bool success)
 		modified();
 		for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
 			(*i)->build_finished(success);
+		signal_modified.emit();
 	}
 }