Un-abbreviate function names

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 8068bc6ed02f62277984215dd74c5b07d52b5d62..97e52552b8d553ae3d360245a56bd15a440efc91 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -2,7 +2,6 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
@@ -11,36 +10,41 @@ using namespace std;
 using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
-       FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
-       comp(c),
+       FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
        source(s)       
 {
-       buildable = true;
-       add_depend(&source);
+       component = &c;
+       add_dependency(source);
 }
 
-void ObjectFile::find_depends()
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
-       for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+       const SourcePackage &pkg = comp.get_package();
+       FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+       string fn;
+       for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
        {
-               Target *tgt = *i;
-               if(tgt->get_depends_ready())
-               {
-                       i = new_deps.erase(i);
-                       find_depends(dynamic_cast<FileTarget *>(tgt));
-               }
-               else
-                       ++i;
+               if(!fn.empty())
+                       fn += '_';
+               if(*i!=".")
+                       fn += *i;
        }
-
-       deps_ready = new_deps.empty();
+       return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
 }
 
+void ObjectFile::find_dependencies()
+{
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       {
+               (*i)->prepare();
+               find_dependencies(dynamic_cast<FileTarget *>(*i));
+       }
+}
 
-void ObjectFile::find_depends(FileTarget *tgt)
+void ObjectFile::find_dependencies(FileTarget *tgt)
 {
-       Target *rtgt = tgt->get_real_target();
-       const Dependencies &tdeps = rtgt->get_depends();
+       FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
+       const Dependencies &tdeps = rtgt->get_dependencies();
        Dependencies deps_to_add;
        if(rtgt==tgt)
        {
@@ -52,11 +56,11 @@ void ObjectFile::find_depends(FileTarget *tgt)
        {
                /* The target has been displaced by installing it.  Displace any
                dependencies that come from the same package as well. */
-               const SourcePackage *tpkg = dynamic_cast<const SourcePackage *>(rtgt->get_package());
+               const SourcePackage *tpkg = rtgt->get_package();
                for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
                {
                        FileTarget *file = dynamic_cast<FileTarget *>(*i);
-                       if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source())>=0)
+                       if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
                        {
                                FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
                                if(Target *ddep = builder.get_vfs().get_target(displaced))
@@ -69,23 +73,5 @@ void ObjectFile::find_depends(FileTarget *tgt)
 
        for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
                if(find(depends.begin(), depends.end(), *i)==depends.end())
-                       add_depend(*i);
-}
-
-void ObjectFile::add_depend(Target *tgt)
-{
-       Target::add_depend(tgt);
-       new_deps.push_back(tgt);
-}
-
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
-{
-       const SourcePackage &pkg = comp.get_package();
-       string fn = FS::basepart(src)+".o";
-       if(!fn.compare(0, 2, "./"))
-               fn.erase(0, 2);
-       for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
-               if(*i=='/')
-                       *i = '_';
-       return pkg.get_temp_dir()/comp.get_name()/fn;
+                       add_dependency(**i);
 }