X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=297ae3f4211b9a4b3be3b2f68e1fd2ab43dc2ec5;hb=4facd021514ab372c23b1b132d6b4b62baa4efbf;hp=adde0cd180727b8ceb0a18d46455c60e3cf1f244;hpb=f8961a9113477735724a3a5229b9338bc9c0fe2e;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index adde0cd..297ae3f 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -10,32 +10,29 @@
 using namespace std;
 using namespace Msp;
 
-Target::Target(Builder &b, const Package *p, const string &n):
+Target::Target(Builder &b, const string &n):
 	builder(b),
-	package(p),
+	package(0),
+	component(0),
 	name(n),
 	tool(0),
-	building(false),
-	rebuild(false),
-	deps_ready(false),
-	preparing(false),
-	prepared(false)
+	state(INIT)
 {
 	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();
 		if(tgt)
 			return tgt;
-		else if((*i)->get_rebuild())
+		else if((*i)->needs_rebuild())
 			self_ok = false;
 	}
 
@@ -59,28 +56,30 @@ 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;
+	find_depends();
+
 	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 +90,21 @@ 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;
+	if(reason.empty())
+		throw invalid_argument("No reason given for rebuilding "+name);
+
+	state = REBUILD;
 	rebuild_reason = reason;
 }
 
 void Target::build_finished(bool /*success*/)
 {
-	building = false;
-	rebuild = false;
+	state = UPTODATE;
 }