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

diff --git a/source/target.cpp b/source/target.cpp
index 5329011..c43ad99 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,47 +1,39 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/time/utils.h>
-#include "action.h"
 #include "builder.h"
 #include "filetarget.h"
 #include "package.h"
-#include "sourcepackage.h"
 #include "target.h"
+#include "task.h"
+#include "tool.h"
 
 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),
-	buildable(false),
-	building(false),
-	rebuild(false),
-	deps_ready(false),
-	preparing(false),
-	prepared(false)
-{ }
+	tool(0),
+	state(INIT),
+	deps_ready(false)
+{
+	builder.add_target(this);
+}
 
 Target *Target::get_buildable_target()
 {
-	if(!rebuild)
+	if(!needs_rebuild())
 		return 0;
 
-	bool self_ok = !building;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	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;
 	}
 
@@ -51,94 +43,64 @@ 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)
-		throw InvalidParameterValue("A target can't depend on itself");
+		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(preparing)
+	if(state==PREPARING)
 	{
 		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
 		return;
 	}
 
-	preparing = true;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	state = PREPARING;
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
-	preparing = false;
-	prepared = true;
+	if(state==PREPARING)
+		state = UPTODATE;
 }
 
-Action *Target::build()
+Task *Target::build()
 {
-	if(!buildable)
+	if(!tool)
 	{
-		rebuild = false;
+		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());
 
-	Action *action = create_action();
-	if(action)
-	{
-		action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
+	Task *task = tool->run(*this);
+	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
+	state = BUILDING;
 
-		building = true;
-	}
-
-	return action;
-}
-
-void Target::touch()
-{
-	mtime = Time::now();
+	return task;
 }
 
 void Target::mark_rebuild(const std::string &reason)
 {
-	rebuild = true;
+	state = REBUILD;
 	rebuild_reason = reason;
 }
 
-void Target::check_rebuild()
-{
-	if(!buildable)
-		return;
-
-	if(builder.get_build_all())
-		mark_rebuild("Rebuilding everything");
-	else if(!mtime)
-		mark_rebuild("Does not exist");
-	else
-	{
-		for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
-		{
-			if((*i)->get_mtime()>mtime)
-				mark_rebuild((*i)->get_name()+" has changed");
-			else if((*i)->get_rebuild())
-				mark_rebuild((*i)->get_name()+" needs rebuilding");
-		}
-	}
-
-	const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
-		mark_rebuild("Package options changed");
-}
-
-void Target::build_done()
+void Target::build_finished(bool /*success*/)
 {
-	building = false;
-	rebuild = false;
+	state = UPTODATE;
 }