X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flib%2Ftarget.cpp;h=558b3b2c107485594cb8831c40d5cdffb2c238fb;hb=f4de41c810319d3ecc8bb5084de06a953037b7b7;hp=dbdd950e4a3bd7570c920b6122b0ee3cfcecf3e2;hpb=c8e829c219c65ff8e93b6c7b66212ff0876441c5;p=builder.git

diff --git a/source/lib/target.cpp b/source/lib/target.cpp
index dbdd950..558b3b2 100644
--- a/source/lib/target.cpp
+++ b/source/lib/target.cpp
@@ -1,6 +1,7 @@
 #include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/utils.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
@@ -11,6 +12,8 @@
 using namespace std;
 using namespace Msp;
 
+vector<Target *> Target::prepare_stack;
+
 Target::Target(Builder &b, const string &n):
 	builder(b),
 	name(n)
@@ -111,16 +114,33 @@ void Target::mark_rebuild(const string &reason)
 
 void Target::prepare()
 {
+	if(primary_target && primary_target->state<PREPARING)
+		primary_target->prepare();
+
 	if(state>PREPARING)
 		return;
 	if(state==PREPARING)
 	{
-		builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
-		problems.push_back("Dependency cycle detected");
+		auto i = find(prepare_stack, this);
+		if(i!=prepare_stack.end())
+		{
+			string cycle;
+			for(; i!=prepare_stack.end(); ++i)
+				append(cycle, " -> ", (*i)->name);
+			append(cycle, " -> ", name);
+			builder.get_logger().log("problems", "Dependency cycle detected: %s", cycle);
+			problems.push_back(format("Dependency cycle detected: %s", cycle));
+		}
+		else
+		{
+			builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
+			problems.push_back("Dependency cycle detected");
+		}
 		state = BROKEN;
 		return;
 	}
 
+	PushPrepare _push(this);
 	state = PREPARING;
 	/* Prepare existing dependencies early, because their information may be
 	needed to find other dependencies. */
@@ -136,12 +156,11 @@ void Target::prepare()
 	{
 		if(FileTarget *tool_exe = tool->get_executable())
 			add_dependency(*tool_exe);
-		broken |= !tool->get_problems().empty();
+		broken |= tool->is_broken();
 
-		// 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());
+		// Only check package and component brokenness for buildable targets
+		broken |= (package && package->is_broken());
+		broken |= (component && component->is_broken());
 	}
 
 	/* Now that all dependencies are known, prepare them again.  This will do