X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=43ecb7ba313a1a68ce9fefb139997ace0e203584;hb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;hp=b24013aaf55eabb094c72ef912480a956c6a9ae8;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index b24013a..43ecb7b 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,53 +1,40 @@
-/* $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 <msp/strings/format.h>
 #include "builder.h"
-#include "package.h"
+#include "filetarget.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),
-	prepared(false),
-	counted(false)
+	tool(0),
+	state(INIT)
 {
 	builder.add_target(this);
-
-	struct stat st;
-	if(!FS::stat(name, st))
-		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 }
 
 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();
+		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)
@@ -56,99 +43,90 @@ Target *Target::get_buildable_target()
 	return 0;
 }
 
+void Target::set_tool(const Tool &t)
+{
+	tool = &t;
+}
+
+void Target::force_rebuild()
+{
+	if(!is_buildable())
+		throw logic_error("Target::force_rebuild");
+	mark_rebuild("Forced rebuild");
+}
+
 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);
+	if(state>PREPARING)
+		dep->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 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;
+	}
 
-	prepared=true;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	state = PREPARING;
+	find_depends();
+	if(tool)
+	{
+		if(FileTarget *tool_exe = tool->get_executable())
+			add_depend(tool_exe);
+	}
+
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->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));
 }
 
-Action *Target::build()
+Task *Target::build()
 {
-	if(!buildable)
+	if(!tool)
 	{
-		rebuild=false;
+		state = UPTODATE;
 		return 0;
 	}
 
-	if(!builder.get_dry_run() && FS::exists(name))
-		FS::unlink(name);
+	// 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;
+	return task;
 }
 
-unsigned Target::count_rebuild()
+void Target::mark_rebuild(const string &reason)
 {
-	if(counted)
-		return 0;
-
-	counted=true;
-	unsigned count=rebuild;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
-		count+=(*i)->count_rebuild();
-	return count;
-}
+	if(reason.empty())
+		throw invalid_argument("No reason given for rebuilding "+name);
 
-void Target::touch()
-{
-	mtime=Time::now();
-}
+	state = REBUILD;
+	rebuild_reason = reason;
 
-void Target::mark_rebuild(const std::string &reason)
-{
-	rebuild=true;
-	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(FS::basename((*i)->get_name())+" has changed");
-			else if((*i)->get_rebuild())
-				mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
-		}
-	}
+	builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
 
-	const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
-	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
-		mark_rebuild("Package options changed");
+	signal_bubble_rebuild.emit();
 }
 
-void Target::build_done()
+void Target::build_finished(bool /*success*/)
 {
-	building=false;
-	rebuild=false;
+	state = UPTODATE;
 }