Move package management to a separate class

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 52c8a81e8de302efe936802fc87d084e8eba4260..39372a415c0e67350d0a4862282a74e489dd213e 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"
@@ -15,51 +14,52 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
        comp(c),
        source(s)       
 {
-       buildable = true;
        add_depend(&source);
 }
 
 void ObjectFile::find_depends()
 {
-       for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
-               Target *tgt = *i;
-               if(tgt->get_depends_ready())
-               {
-                       i = new_deps.erase(i);
-                       find_depends(tgt);
-               }
-               else
-                       ++i;
+               (*i)->prepare();
+               find_depends(dynamic_cast<FileTarget *>(*i));
        }
-
-       deps_ready = new_deps.empty();
 }
 
 
-void ObjectFile::find_depends(Target *tgt)
+void ObjectFile::find_depends(FileTarget *tgt)
 {
-       SourceFile *src = dynamic_cast<SourceFile *>(tgt->get_real_target());
-       FileTarget *file = dynamic_cast<FileTarget *>(tgt);
-       if(!src || !file)
-               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)
+       FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
+       const Dependencies &tdeps = rtgt->get_depends();
+       Dependencies deps_to_add;
+       if(rtgt==tgt)
        {
-               Target *hdr = builder.get_vfs().find_header(*i, spath, incpath);
-               if(hdr && find(depends.begin(), depends.end(), hdr)==depends.end())
-                       add_depend(hdr);
+               /* We are using the target from its original location, so dependencies
+               apply directly */
+               deps_to_add = tdeps;
+       }
+       else
+       {
+               /* 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());
+               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)
+                       {
+                               FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
+                               if(Target *ddep = builder.get_vfs().get_target(displaced))
+                                       deps_to_add.push_back(ddep);
+                       }
+                       else
+                               deps_to_add.push_back(*i);
+               }
        }
-}
 
-void ObjectFile::add_depend(Target *tgt)
-{
-       Target::add_depend(tgt);
-       new_deps.push_back(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);
 }
 
 FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)