X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=5022bdd0a636774e7ac648c727ea06e2c3b28d34;hb=7aeaa4ba965f596edad438c02e345a8843f7469a;hp=3e531f7ae8a09d2b8fb3def6265ee5e5659cc552;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3e531f7..5022bdd 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
@@ -18,18 +25,42 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 	add_depend(&src);
 }
 
+/**
+Processes as many new dependences as possible.  Some may be left unprocessed
+if their own dependencies are not ready, requiring another call to this
+function.  Use the get_deps_ready() function to determine whether this is the
+case.
+*/
 void ObjectFile::find_depends()
 {
-	find_depends(depends.front());
+	for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
+	{
+		Target *tgt=*i;
+		if(tgt->get_depends_ready())
+		{
+			i=new_deps.erase(i);
+			find_depends(tgt);
+		}
+		else
+			++i;
+	}
+
+	deps_ready=new_deps.empty();
 }
 
 Action *ObjectFile::build()
 {
-	return Target::build(new Compile(builder, depends.front()->get_name(), name, comp));
+	return Target::build(new Compile(builder, *this));
 }
 
+/**
+Recursively looks for header targets and adds them as dependencies.
+*/
 void ObjectFile::find_depends(Target *tgt)
 {
+	const string &tname=tgt->get_name();
+	string path=tname.substr(0, tname.rfind('/'));
+
 	SourceFile *src=dynamic_cast<SourceFile *>(tgt);
 	if(!src)
 	{
@@ -40,19 +71,28 @@ void ObjectFile::find_depends(Target *tgt)
 	if(!src)
 		return;
 
-	const string &sname=src->get_name();
-	string path=sname.substr(0, sname.rfind('/'));
+	const string &arch=comp.get_package().get_arch();
+	const StringList &incpath=comp.get_build_info().incpath;
 
 	const list<string> &includes=src->get_includes();
 	for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr2=builder.get_header(*i, path, package->get_build_info().incpath);
-		if(hdr2)
+		Target *hdr2=builder.get_header(*i, arch, path, incpath);
+		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
 			add_depend(hdr2);
 	}
 }
 
+/**
+Adds a target to the dependency list as well as the new dependencies list.
+*/
+void ObjectFile::add_depend(Target *tgt)
+{
+	Target::add_depend(tgt);
+	new_deps.push_back(tgt);
+}
+
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
-	return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	return (comp.get_package().get_temp_dir()/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
 }