Code reorganizing and cleanup

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 8ba3cc38896faefc3493329da6a2570dfd83a268..e03428837838afdbd78447862075f4db66d082b6 100644 (file)
--- 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;
@@ -9,7 +11,7 @@ using namespace Msp;
 Target *Target::get_buildable_target()
 {
        bool self_ok=true;
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt=(*i)->get_buildable_target();
                if(tgt)
@@ -35,27 +37,43 @@ void Target::prepare()
        if(prepared)
                return;
 
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
 
        check_rebuild();
 }
 
+unsigned Target::count_rebuild()
+{
+       if(counted)
+               return 0;
+
+       counted=true;
+       unsigned count=rebuild;
+       for(TargetList::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),
+       buildable(false),
        building(false),
        rebuild(false),
+       deps_ready(false),
        prepared(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)
@@ -69,18 +87,22 @@ void Target::check_rebuild()
        if(!buildable)
                return;
 
-       if(!mtime)
+       if(builder.get_build_all())
+               mark_rebuild("Rebuilding everything");
+       else if(!mtime)
                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_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)