X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=f33e141edbb40758b1c363f3de42c41fb4d833cf;hb=b5ad62c2c4c7eeadd881e3f157bde96e4dd2cc0e;hp=d55202289dfd026fb1893a3c83abd8f1cd34f670;hpb=9976a7bdf0e53966dce4bc828a37eb42de0223e3;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index d552022..f33e141 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -8,10 +8,18 @@
 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::get_buildable_target()
 {
-	bool self_ok=true;
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	if(!rebuild)
+		return 0;
+
+	bool self_ok=!building;
+	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt=(*i)->get_buildable_target();
 		if(tgt)
@@ -20,7 +28,7 @@ Target *Target::get_buildable_target()
 			self_ok=false;
 	}
 
-	if(self_ok && rebuild && !building)
+	if(self_ok)
 		return this;
 
 	return 0;
@@ -28,21 +36,34 @@ 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);
 }
 
+/**
+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;
 
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	prepared=true;
+	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
+
 }
 
+/**
+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)
@@ -50,11 +71,14 @@ unsigned Target::count_rebuild()
 
 	counted=true;
 	unsigned count=rebuild;
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+	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();
@@ -64,13 +88,15 @@ 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),
-	buildable(false),
 	counted(false)
 {
+	builder.add_target(this);
+
 	struct stat st;
 	if(!Path::stat(name, st))
 		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
@@ -82,6 +108,9 @@ void Target::mark_rebuild(const std::string &reason)
 	rebuild_reason=reason;
 }
 
+/**
+Checks if this target needs to be rebuilt and why.
+*/
 void Target::check_rebuild()
 {
 	if(!buildable)
@@ -93,7 +122,7 @@ void Target::check_rebuild()
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(list<Target *>::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+		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");
@@ -105,6 +134,10 @@ void Target::check_rebuild()
 		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;
@@ -112,6 +145,9 @@ Action *Target::build(Action *action)
 	return action;
 }
 
+/**
+Handles for the build_done signal of Action.
+*/
 void Target::build_done()
 {
 	building=false;