X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=6653c11fb0b90e0e3e916a63b7a74548c259daab;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=481d2f4a68dd460a6f3c0a8222af58be349208c9;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 481d2f4..6653c11 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,47 +1,112 @@
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.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;
 
-Target *TargetRef::get_target()
+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)
 {
-	if(!target)
-		target=builder.get_target(name);
-	return target;
+	builder.add_target(this);
 }
 
 Target *Target::get_buildable_target()
 {
-	if(rebuild && ready_for_build && !building)
-		return this;
+	if(!rebuild)
+		return 0;
 
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	bool self_ok = !building;
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
-		Target *tgt=(*i)->get_buildable_target();
+		Target *tgt = (*i)->get_buildable_target();
 		if(tgt)
 			return tgt;
+		else if((*i)->get_rebuild())
+			self_ok = false;
 	}
 
+	if(self_ok)
+		return this;
+
 	return 0;
 }
 
+void Target::set_tool(const Tool &t)
+{
+	tool = &t;
+}
+
 void Target::add_depend(Target *dep)
 {
+	if(dep==this)
+		throw invalid_argument("Target::add_depend");
 	depends.push_back(dep);
-	dep->rdepends.push_back(this);
 }
 
-Target::Target(Builder &b, const Package *p, const string &n):
-	builder(b),
-	package(p),
-	name(n),
-	building(false),
-	rebuild(false),
-	ready_for_build(false)
-{ }
+void Target::prepare()
+{
+	if(prepared)
+		return;
+	if(preparing)
+	{
+		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+		return;
+	}
+
+	preparing = true;
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+		(*i)->prepare();
+
+	check_rebuild();
+	preparing = false;
+	prepared = true;
+}
+
+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());
+
+	Task *task = tool->run(*this);
+	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
+	building = true;
+
+	return task;
+}
 
 void Target::mark_rebuild(const std::string &reason)
 {
-	rebuild=true;
-	rebuild_reason=reason;
+	rebuild = true;
+	rebuild_reason = reason;
+}
+
+void Target::build_finished(bool /*success*/)
+{
+	building = false;
+	rebuild = false;
 }