Refactor transitive dependencies to work on all targets

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
deleted file mode 100644 (file)
index 02f1ba5..0000000
--- a/source/objectfile.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <msp/path/utils.h>
-#include "builder.h"
-#include "compile.h"
-#include "component.h"
-#include "install.h"
-#include "objectfile.h"
-#include "package.h"
-#include "sourcefile.h"
-
-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)
-{
-       buildable=true;
-       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(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
-       {
-               Target *tgt=*i;
-               if(tgt->get_depends_ready())
-               {
-                       i=new_deps.erase(i);
-                       find_depends(tgt);
-               }
-               else
-                       ++i;
-       }
-
-       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);
-       if(!src)
-       {
-               Install *inst=dynamic_cast<Install *>(tgt);
-               if(inst)
-                       src=dynamic_cast<SourceFile *>(inst->get_depends().front());
-       }
-       if(!src)
-               return;
-
-       const string &arch=comp.get_package().get_arch();
-       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, arch, path, 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)
-{
-       return (comp.get_package().get_temp_dir()/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
-}