X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=f2a1a1372e482489a24a1ce5bbf9de38dae011b6;hb=463a3521e27870294455373f9c69279069611975;hp=c0c3c18051bbfcd4d8c76250b59f1c081c694b85;hpb=e7fe6a0e161cbba80ef924f53792eded80cbb3a1;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index c0c3c18..f2a1a13 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,18 +1,9 @@
-/* $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"
 
 using namespace std;
@@ -28,7 +19,9 @@ Target::Target(Builder &b, const Package *p, const string &n):
 	deps_ready(false),
 	preparing(false),
 	prepared(false)
-{ }
+{
+	builder.add_target(this);
+}
 
 Target *Target::get_buildable_target()
 {
@@ -54,7 +47,7 @@ Target *Target::get_buildable_target()
 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);
 }
 
@@ -85,6 +78,7 @@ Action *Target::build()
 		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());
@@ -100,42 +94,12 @@ Action *Target::build()
 	return action;
 }
 
-void Target::touch()
-{
-	mtime = Time::now();
-}
-
 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((*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()
 {
 	building = false;