Fix a problem in finding ObjectFile dependencies

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3fd88d25b06f83af74eb8a051e55d4af05a2cf06..ba20f7d8bde6428e0a951536a78f9d7cc8385a7c 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,11 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "compile.h"
 #include "component.h"
@@ -17,20 +18,15 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
-       Target(b, &c.get_package(), generate_target_name(c, src.get_name())),
-       comp(c)
+ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
+       FileTarget(b, &c.get_package(), generate_target_path(c, FS::basename(s.get_path()))),
+       comp(c),
+       source(s)       
 {
        buildable=true;
-       add_depend(&src);
+       add_depend(&source);
 }
 
-/**
-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(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
@@ -48,51 +44,47 @@ void ObjectFile::find_depends()
        deps_ready=new_deps.empty();
 }
 
-Action *ObjectFile::build()
-{
-       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);
+       FileTarget *file=src;
        if(!src)
        {
-               Install *inst=dynamic_cast<Install *>(tgt);
-               if(inst)
-                       src=dynamic_cast<SourceFile *>(inst->get_depends().front());
+               if(Install *inst=dynamic_cast<Install *>(tgt))
+               {
+                       file=inst;
+                       src=dynamic_cast<SourceFile *>(&inst->get_source());
+               }
        }
        if(!src)
                return;
 
+       FS::Path spath=FS::dirname(file->get_path());
        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, incpath);
+               Target *hdr2=builder.get_header(*i, spath, 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)
+Action *ObjectFile::create_action()
+{
+       return new Compile(builder, *this);
+}
+
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
 {
        const SourcePackage &pkg=comp.get_package();
-       return (pkg.get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
+       return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(src)+".o");
 }