X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=691f70038e932bb79df4f71567cd72eb1f197899;hb=d334fc1d04b7f83c7a2e9f16439fec884f4de471;hp=510dfbdf708fa83cd57ee0426a3b0b1c01fc5a56;hpb=f75a99316e896cf1e424a489ce360a67844d86b0;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 510dfbd..691f700 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -3,7 +3,7 @@
 #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"
@@ -17,13 +17,34 @@ Target::Target(Builder &b, const string &n):
 	component(0),
 	name(n),
 	tool(0),
-	state(INIT)
+	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;
 }
 
 Target *Target::get_buildable_target()
 {
+	if(primary_target)
+		return primary_target->get_buildable_target();
 	if(!needs_rebuild())
 		return 0;
 
@@ -46,6 +67,8 @@ Target *Target::get_buildable_target()
 void Target::set_tool(const Tool &t)
 {
 	tool = &t;
+	for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+		(*i)->set_tool(t);
 }
 
 void Target::force_rebuild()
@@ -55,12 +78,17 @@ void Target::force_rebuild()
 	mark_rebuild("Forced rebuild");
 }
 
-void Target::add_depend(Target *dep)
+void Target::mark_rebuild(const string &reason)
 {
-	if(dep==this)
-		throw invalid_argument("Target::add_depend");
-	depends.push_back(dep);
-	dep->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+	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()
@@ -74,11 +102,11 @@ void Target::prepare()
 	}
 
 	state = PREPARING;
-	find_depends();
+	find_dependencies();
 	if(tool)
 	{
 		if(FileTarget *tool_exe = tool->get_executable())
-			add_depend(tool_exe);
+			add_dependency(*tool_exe);
 	}
 
 	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -87,21 +115,20 @@ void Target::prepare()
 	check_rebuild();
 	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(!tool)
 	{
+		// This special case is needed for VirtualTargets
 		state = UPTODATE;
 		return 0;
 	}
 
-	// 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());
-
 	Task *task = tool->run(*this);
 	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
 	state = BUILDING;
@@ -109,19 +136,13 @@ Task *Target::build()
 	return task;
 }
 
-void Target::mark_rebuild(const std::string &reason)
-{
-	if(reason.empty())
-		throw invalid_argument("No reason given for rebuilding "+name);
-
-	state = REBUILD;
-	rebuild_reason = reason;
-	signal_bubble_rebuild.emit();
-
-	builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
-}
-
-void Target::build_finished(bool /*success*/)
+void Target::build_finished(bool success)
 {
 	state = UPTODATE;
+	if(success)
+	{
+		modified();
+		for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+			(*i)->build_finished(success);
+	}
 }