Consolidate various target state variables into a single state

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 65d801f91421a3544d6f077f9683f40032ce7d3f..7c6141df7403b1978ccd32f8fdfa6ce911c10f74 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -15,21 +15,18 @@ Target::Target(Builder &b, const Package *p, const string &n):
        package(p),
        name(n),
        tool(0),
-       building(false),
-       rebuild(false),
-       deps_ready(false),
-       preparing(false),
-       prepared(false)
+       state(INIT),
+       deps_ready(false)
 {
        builder.add_target(this);
 }
 
 Target *Target::get_buildable_target()
 {
-       if(!rebuild)
+       if(!needs_rebuild())
                return 0;
 
-       bool self_ok = !building;
+       bool self_ok = state!=BUILDING;
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt = (*i)->get_buildable_target();
@@ -59,28 +56,28 @@ void Target::add_depend(Target *dep)
 
 void Target::prepare()
 {
-       if(prepared)
+       if(state>PREPARING)
                return;
-       if(preparing)
+       if(state==PREPARING)
        {
                builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
                return;
        }
 
-       preparing = true;
+       state = PREPARING;
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
 
        check_rebuild();
-       preparing = false;
-       prepared = true;
+       if(state==PREPARING)
+               state = UPTODATE;
 }
 
 Task *Target::build()
 {
        if(!tool)
        {
-               rebuild = false;
+               state = UPTODATE;
                return 0;
        }
 
@@ -91,19 +88,18 @@ Task *Target::build()
 
        Task *task = tool->run(*this);
        task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
-       building = true;
+       state = BUILDING;
 
        return task;
 }
 
 void Target::mark_rebuild(const std::string &reason)
 {
-       rebuild = true;
+       state = REBUILD;
        rebuild_reason = reason;
 }
 
 void Target::build_finished(bool /*success*/)
 {
-       building = false;
-       rebuild = false;
+       state = UPTODATE;
 }