Move package management to a separate class

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 8068bc6ed02f62277984215dd74c5b07d52b5d62..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,31 +14,22 @@ 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(dynamic_cast<FileTarget *>(tgt));
-               }
-               else
-                       ++i;
+               (*i)->prepare();
+               find_depends(dynamic_cast<FileTarget *>(*i));
        }
-
-       deps_ready = new_deps.empty();
 }
 
 
 void ObjectFile::find_depends(FileTarget *tgt)
 {
-       Target *rtgt = tgt->get_real_target();
+       FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
        const Dependencies &tdeps = rtgt->get_depends();
        Dependencies deps_to_add;
        if(rtgt==tgt)
@@ -72,12 +62,6 @@ void ObjectFile::find_depends(FileTarget *tgt)
                        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();