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, FS::relative(s.get_path(), c.get_package().get_source()).str())),
source(s)
{
- add_depend(&source);
+ component = &c;
+ add_depend(source);
+}
+
+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;
}
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)
{
FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
{
/* 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);
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_depend(**i);
}