#include <msp/fs/utils.h>
#include "builder.h"
#include "component.h"
-#include "install.h"
#include "objectfile.h"
#include "sourcefile.h"
#include "sourcepackage.h"
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)
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();