X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=dd75e9a4a98b4d18206a8e7cf7c1512746557902;hb=2d765e850b2360940111cbd522af659cc3c4aef7;hp=6653c11fb0b90e0e3e916a63b7a74548c259daab;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 6653c11..dd75e9a 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"
@@ -10,33 +11,53 @@
 using namespace std;
 using namespace Msp;
 
-Target::Target(Builder &b, const Package *p, const string &n):
+Target::Target(Builder &b, const string &n):
 	builder(b),
-	package(p),
+	package(0),
+	component(0),
 	name(n),
 	tool(0),
-	buildable(false),
-	building(false),
-	rebuild(false),
-	deps_ready(false),
-	preparing(false),
-	prepared(false)
+	state(INIT),
+	primary_target(0)
 {
-	builder.add_target(this);
+	builder.get_build_graph().add_target(this);
+}
+
+void Target::add_dependency(Target &dep)
+{
+	if(&dep==this)
+		throw invalid_argument("Target::add_depend");
+	depends.push_back(&dep);
+	if(state>PREPARING)
+		dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+}
+
+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()
 {
-	if(!rebuild)
+	if(primary_target)
+		return primary_target->get_buildable_target();
+	if(!needs_rebuild())
 		return 0;
 
-	bool self_ok = !building;
+	bool self_ok = state!=BUILDING;
 	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt = (*i)->get_buildable_target();
 		if(tgt)
 			return tgt;
-		else if((*i)->get_rebuild())
+		else if((*i)->needs_rebuild())
 			self_ok = false;
 	}
 
@@ -46,67 +67,102 @@ 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::add_depend(Target *dep)
+void Target::force_rebuild()
 {
-	if(dep==this)
-		throw invalid_argument("Target::add_depend");
-	depends.push_back(dep);
+	if(!is_buildable())
+		throw logic_error("Target::force_rebuild");
+	mark_rebuild("Forced rebuild");
+}
+
+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::prepare()
 {
-	if(prepared)
+	if(state>PREPARING)
 		return;
-	if(preparing)
+	if(state==PREPARING)
 	{
-		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+		problems.push_back("Dependency cycle detected");
+		state = BROKEN;
 		return;
 	}
 
-	preparing = true;
+	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();
+	}
 
 	check_rebuild();
-	preparing = false;
-	prepared = true;
+	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));
 }
 
 Task *Target::build()
 {
-	if(!buildable)
-	{
-		rebuild = false;
-		return 0;
-	}
-	if(!tool)
-		throw logic_error("buildable && !tool");
-
-	// XXX Minor breach of OO here
-	if(FileTarget *ft = dynamic_cast<FileTarget *>(this))
-		if(!builder.get_dry_run() && FS::exists(ft->get_path()))
-			FS::unlink(ft->get_path());
+	if(primary_target)
+		return primary_target->build();
 
 	Task *task = tool->run(*this);
 	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
-	building = true;
+	state = BUILDING;
 
-	return task;
-}
+	build(*task);
+	for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+		(*i)->build(*task);
 
-void Target::mark_rebuild(const std::string &reason)
-{
-	rebuild = true;
-	rebuild_reason = reason;
+	return task;
 }
 
-void Target::build_finished(bool /*success*/)
+void Target::build_finished(bool success)
 {
-	building = false;
-	rebuild = false;
+	state = UPTODATE;
+	if(success)
+	{
+		modified();
+		for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+			(*i)->build_finished(success);
+	}
 }