X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=6653c11fb0b90e0e3e916a63b7a74548c259daab;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=341b249e2b17bb9f84dac682093765d4d7102acd;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 341b249..6653c11 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,10 +1,11 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include "action.h"
 #include "builder.h"
 #include "filetarget.h"
 #include "package.h"
 #include "target.h"
+#include "task.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -13,13 +14,16 @@ Target::Target(Builder &b, const Package *p, const string &n):
 	builder(b),
 	package(p),
 	name(n),
+	tool(0),
 	buildable(false),
 	building(false),
 	rebuild(false),
 	deps_ready(false),
 	preparing(false),
 	prepared(false)
-{ }
+{
+	builder.add_target(this);
+}
 
 Target *Target::get_buildable_target()
 {
@@ -27,7 +31,7 @@ Target *Target::get_buildable_target()
 		return 0;
 
 	bool self_ok = !building;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt = (*i)->get_buildable_target();
 		if(tgt)
@@ -42,6 +46,11 @@ Target *Target::get_buildable_target()
 	return 0;
 }
 
+void Target::set_tool(const Tool &t)
+{
+	tool = &t;
+}
+
 void Target::add_depend(Target *dep)
 {
 	if(dep==this)
@@ -60,7 +69,7 @@ void Target::prepare()
 	}
 
 	preparing = true;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
@@ -68,28 +77,26 @@ void Target::prepare()
 	prepared = true;
 }
 
-Action *Target::build()
+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());
 
-	Action *action = create_action();
-	if(action)
-	{
-		action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-
-		building = true;
-	}
+	Task *task = tool->run(*this);
+	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
+	building = true;
 
-	return action;
+	return task;
 }
 
 void Target::mark_rebuild(const std::string &reason)
@@ -98,7 +105,7 @@ void Target::mark_rebuild(const std::string &reason)
 	rebuild_reason = reason;
 }
 
-void Target::build_done()
+void Target::build_finished(bool /*success*/)
 {
 	building = false;
 	rebuild = false;