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

diff --git a/source/target.cpp b/source/target.cpp
index 8ba3cc3..04d9260 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,6 +1,8 @@
 #include <msp/path/utils.h>
+#include <msp/time/utils.h>
 #include "action.h"
 #include "builder.h"
+#include "package.h"
 #include "target.h"
 
 using namespace std;
@@ -41,21 +43,37 @@ void Target::prepare()
 	check_rebuild();
 }
 
+unsigned Target::count_rebuild()
+{
+	if(counted)
+		return 0;
+
+	counted=true;
+	unsigned count=rebuild;
+	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+		count+=(*i)->count_rebuild();
+	return count;
+}
+
+void Target::touch()
+{
+	mtime=Time::now();
+}
+
 Target::Target(Builder &b, const Package *p, const string &n):
 	builder(b),
 	package(p),
 	name(n),
 	building(false),
 	rebuild(false),
+	deps_ready(false),
 	prepared(false),
-	buildable(false)
+	buildable(false),
+	counted(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)
@@ -75,12 +93,14 @@ void Target::check_rebuild()
 	{
 		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");
+			if((*i)->get_mtime()>mtime)
+				mark_rebuild(Path::basename((*i)->get_name())+" has changed");
 			else if((*i)->get_rebuild())
-				mark_rebuild((*i)->get_name()+" needs rebuilding");
+				mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
 		}
 	}
+	if(!rebuild && package && package->get_config().get_mtime()>mtime)
+		mark_rebuild("Package options changed");
 }
 
 Action *Target::build(Action *action)