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

diff --git a/source/target.cpp b/source/target.cpp
index e8ed647..0762050 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,8 +1,17 @@
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 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 "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 
 using namespace std;
@@ -36,6 +45,8 @@ Target *Target::get_buildable_target()
 
 void Target::add_depend(Target *dep)
 {
+	if(dep==this)
+		throw InvalidParameterValue("A target can't depend on itself");
 	depends.push_back(dep);
 	dep->rdepends.push_back(this);
 }
@@ -58,6 +69,28 @@ void Target::prepare()
 
 }
 
+Action *Target::build()
+{
+	if(!buildable)
+	{
+		rebuild=false;
+		return 0;
+	}
+
+	if(!builder.get_dry_run() && FS::exists(name))
+		FS::unlink(name);
+
+	Action *action=create_action();
+	if(action)
+	{
+		action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
+
+		building=true;
+	}
+
+	return action;
+}
+
 /**
 Returns the number of targets that need to be rebuilt in order to get this
 target up-to-date.
@@ -93,8 +126,10 @@ Target::Target(Builder &b, const Package *p, const string &n):
 	prepared(false),
 	counted(false)
 {
+	builder.add_target(this);
+
 	struct stat st;
-	if(!Path::stat(name, st))
+	if(!FS::stat(name, st))
 		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 }
 
@@ -121,24 +156,15 @@ void Target::check_rebuild()
 		for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
 		{
 			if((*i)->get_mtime()>mtime)
-				mark_rebuild(Path::basename((*i)->get_name())+" has changed");
+				mark_rebuild(FS::basename((*i)->get_name())+" has changed");
 			else if((*i)->get_rebuild())
-				mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
+				mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
 		}
 	}
-	if(!rebuild && package && package->get_config().get_mtime()>mtime)
-		mark_rebuild("Package options changed");
-}
 
-/**
-Hooks the target up with the given action, then returns it.  This should be
-called from the public build() function of buildable targets.
-*/
-Action *Target::build(Action *action)
-{
-	building=true;
-	action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-	return action;
+	const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+		mark_rebuild("Package options changed");
 }
 
 /**