X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=c43ad99ea8361cb71934f3fb57a5f4dce27e23ff;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=04d9260514a8de701e2dd1380313c3215a6b7151;hpb=b0eb979b0dc79269cb3bb5bb2e67ef4e80689cfe;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 04d9260..c43ad99 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,117 +1,106 @@
-#include <msp/path/utils.h>
-#include <msp/time/utils.h>
-#include "action.h"
+#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::Target(Builder &b, const string &n):
+	builder(b),
+	package(0),
+	component(0),
+	name(n),
+	tool(0),
+	state(INIT),
+	deps_ready(false)
+{
+	builder.add_target(this);
+}
+
 Target *Target::get_buildable_target()
 {
-	bool self_ok=true;
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	if(!needs_rebuild())
+		return 0;
+
+	bool self_ok = state!=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;
+		else if((*i)->needs_rebuild())
+			self_ok = false;
 	}
 
-	if(self_ok && rebuild && !building)
+	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);
 }
 
 void Target::prepare()
 {
-	if(prepared)
+	if(state>PREPARING)
+		return;
+	if(state==PREPARING)
+	{
+		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
 		return;
+	}
 
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	state = PREPARING;
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
+	if(state==PREPARING)
+		state = UPTODATE;
 }
 
-unsigned Target::count_rebuild()
+Task *Target::build()
 {
-	if(counted)
+	if(!tool)
+	{
+		state = UPTODATE;
 		return 0;
+	}
 
-	counted=true;
-	unsigned count=rebuild;
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
-		count+=(*i)->count_rebuild();
-	return count;
-}
+	// 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());
 
-void Target::touch()
-{
-	mtime=Time::now();
-}
+	Task *task = tool->run(*this);
+	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
+	state = BUILDING;
 
-Target::Target(Builder &b, const Package *p, const string &n):
-	builder(b),
-	package(p),
-	name(n),
-	building(false),
-	rebuild(false),
-	deps_ready(false),
-	prepared(false),
-	buildable(false),
-	counted(false)
-{
-	struct stat st;
-	if(!Path::stat(name, st))
-		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+	return task;
 }
 
 void Target::mark_rebuild(const std::string &reason)
 {
-	rebuild=true;
-	rebuild_reason=reason;
-}
-
-void Target::check_rebuild()
-{
-	if(!buildable)
-		return;
-
-	if(!mtime)
-		mark_rebuild("Does not exist");
-	else
-	{
-		for(list<Target *>::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
-		{
-			if((*i)->get_mtime()>mtime)
-				mark_rebuild(Path::basename((*i)->get_name())+" has changed");
-			else if((*i)->get_rebuild())
-				mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
-		}
-	}
-	if(!rebuild && package && package->get_config().get_mtime()>mtime)
-		mark_rebuild("Package options changed");
-}
-
-Action *Target::build(Action *action)
-{
-	building=true;
-	action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-	return action;
+	state = REBUILD;
+	rebuild_reason = reason;
 }
 
-void Target::build_done()
+void Target::build_finished(bool /*success*/)
 {
-	building=false;
-	rebuild=false;
+	state = UPTODATE;
 }