Better encapsulation of config inside Package

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index bba701d23bc48ca87d03f42790a78f4640a5f907..3f4ba2019f32a835449d72ce336f0f08076573d7 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -19,9 +19,15 @@ 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()
 {
-       for(list<Target *>::iterator i=new_deps.begin(); i!=new_deps.end();)
+       for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
        {
                Target *tgt=*i;
                if(tgt->get_depends_ready())
@@ -38,9 +44,12 @@ void ObjectFile::find_depends()
 
 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();
@@ -59,12 +68,15 @@ void ObjectFile::find_depends(Target *tgt)
        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);
+               Target *hdr2=builder.get_header(*i, path, comp.get_build_info().incpath);
                if(hdr2 && !contains(depends, hdr2))
                        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);
@@ -73,5 +85,5 @@ void ObjectFile::add_depend(Target *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();
 }