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

diff --git a/source/target.cpp b/source/target.cpp
index 0762050..5329011 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -10,6 +10,7 @@ Distributed under the LGPL
 #include <msp/time/utils.h>
 #include "action.h"
 #include "builder.h"
+#include "filetarget.h"
 #include "package.h"
 #include "sourcepackage.h"
 #include "target.h"
@@ -17,24 +18,31 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-/**
-Tries to locate a target that will help getting this target built.  If all
-dependencies are up-to-date, returns this target.  If there are no targets
-ready to be built (maybe because they are being built right now), returns 0.
-*/
+Target::Target(Builder &b, const Package *p, const string &n):
+	builder(b),
+	package(p),
+	name(n),
+	buildable(false),
+	building(false),
+	rebuild(false),
+	deps_ready(false),
+	preparing(false),
+	prepared(false)
+{ }
+
 Target *Target::get_buildable_target()
 {
 	if(!rebuild)
 		return 0;
 
-	bool self_ok=!building;
+	bool self_ok = !building;
 	for(TargetList::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;
+			self_ok = false;
 	}
 
 	if(self_ok)
@@ -51,97 +59,59 @@ void Target::add_depend(Target *dep)
 	dep->rdepends.push_back(this);
 }
 
-/**
-Prepares the target by recursively preparing dependencies, then checking
-whether rebuilding is needed.  A flag is used to prevent unnecessary
-executions.
-*/
 void Target::prepare()
 {
 	if(prepared)
 		return;
+	if(preparing)
+	{
+		builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+		return;
+	}
 
-	prepared=true;
+	preparing = true;
 	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
-
+	preparing = false;
+	prepared = true;
 }
 
 Action *Target::build()
 {
 	if(!buildable)
 	{
-		rebuild=false;
+		rebuild = false;
 		return 0;
 	}
 
-	if(!builder.get_dry_run() && FS::exists(name))
-		FS::unlink(name);
+	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();
+	Action *action = create_action();
 	if(action)
 	{
 		action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
 
-		building=true;
+		building = true;
 	}
 
 	return action;
 }
 
-/**
-Returns the number of targets that need to be rebuilt in order to get this
-target up-to-date.
-*/
-unsigned Target::count_rebuild()
-{
-	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;
-}
-
-/**
-Changes the mtime of the target to the current time.
-*/
 void Target::touch()
 {
-	mtime=Time::now();
-}
-
-Target::Target(Builder &b, const Package *p, const string &n):
-	builder(b),
-	package(p),
-	name(n),
-	buildable(false),
-	building(false),
-	rebuild(false),
-	deps_ready(false),
-	prepared(false),
-	counted(false)
-{
-	builder.add_target(this);
-
-	struct stat st;
-	if(!FS::stat(name, st))
-		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+	mtime = Time::now();
 }
 
 void Target::mark_rebuild(const std::string &reason)
 {
-	rebuild=true;
-	rebuild_reason=reason;
+	rebuild = true;
+	rebuild_reason = reason;
 }
 
-/**
-Checks if this target needs to be rebuilt and why.
-*/
 void Target::check_rebuild()
 {
 	if(!buildable)
@@ -156,22 +126,19 @@ void Target::check_rebuild()
 		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");
+				mark_rebuild((*i)->get_name()+" has changed");
 			else if((*i)->get_rebuild())
-				mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
 		}
 	}
 
-	const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+	const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
 	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
 		mark_rebuild("Package options changed");
 }
 
-/**
-Handles for the build_done signal of Action.
-*/
 void Target::build_done()
 {
-	building=false;
-	rebuild=false;
+	building = false;
+	rebuild = false;
 }