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())),
+ FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
source(s)
{
component = &c;
- add_depend(source);
+ add_dependency(source);
}
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &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;
+ FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+ string fn;
+ for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
+ {
+ if(!fn.empty())
+ fn += '_';
+ if(*i!=".")
+ fn += *i;
+ }
+ return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(fn)+".o");
}
-void ObjectFile::find_depends()
+void ObjectFile::find_dependencies()
{
for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
{
(*i)->prepare();
- find_depends(dynamic_cast<FileTarget *>(*i));
+ find_dependencies(dynamic_cast<FileTarget *>(*i));
}
}
-void ObjectFile::find_depends(FileTarget *tgt)
+void ObjectFile::find_dependencies(FileTarget *tgt)
{
FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
- const Dependencies &tdeps = rtgt->get_depends();
+ const Dependencies &tdeps = rtgt->get_dependencies();
Dependencies deps_to_add;
if(rtgt==tgt)
{
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)
+ if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
{
FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
if(Target *ddep = builder.get_vfs().get_target(displaced))
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);
+ add_dependency(**i);
}