X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=8ba3cc38896faefc3493329da6a2570dfd83a268;hb=59ac0a44d6edf179c01604c6ced744873213f855;hp=481d2f4a68dd460a6f3c0a8222af58be349208c9;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 481d2f4..8ba3cc3 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,27 +1,26 @@
+#include <msp/path/utils.h>
+#include "action.h"
 #include "builder.h"
 #include "target.h"
 
 using namespace std;
-
-Target *TargetRef::get_target()
-{
-	if(!target)
-		target=builder.get_target(name);
-	return target;
-}
+using namespace Msp;
 
 Target *Target::get_buildable_target()
 {
-	if(rebuild && ready_for_build && !building)
-		return this;
-
+	bool self_ok=true;
 	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt=(*i)->get_buildable_target();
 		if(tgt)
 			return tgt;
+		else if((*i)->get_rebuild())
+			self_ok=false;
 	}
 
+	if(self_ok && rebuild && !building)
+		return this;
+
 	return 0;
 }
 
@@ -31,17 +30,68 @@ void Target::add_depend(Target *dep)
 	dep->rdepends.push_back(this);
 }
 
+void Target::prepare()
+{
+	if(prepared)
+		return;
+
+	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+		(*i)->prepare();
+
+	check_rebuild();
+}
+
 Target::Target(Builder &b, const Package *p, const string &n):
 	builder(b),
 	package(p),
 	name(n),
 	building(false),
 	rebuild(false),
-	ready_for_build(false)
-{ }
+	prepared(false),
+	buildable(false)
+{
+	struct stat st;
+	if(!Path::stat(name, st))
+	{
+		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+		vmtime=mtime;
+	}
+}
 
 void Target::mark_rebuild(const std::string &reason)
 {
 	rebuild=true;
 	rebuild_reason=reason;
 }
+
+void Target::check_rebuild()
+{
+	if(!buildable)
+		return;
+
+	if(!mtime)
+		mark_rebuild("Does not exist");
+	else
+	{
+		for(list<Target *>::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+		{
+			if((*i)->get_virtual_mtime()>mtime)
+				mark_rebuild((*i)->get_name()+" has changed");
+			else if((*i)->get_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
+		}
+	}
+}
+
+Action *Target::build(Action *action)
+{
+	building=true;
+	action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
+	return action;
+}
+
+void Target::build_done()
+{
+	building=false;
+	rebuild=false;
+}