ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
- source(s)
+ source(s),
+ used_in_shlib(false)
{
component = &c;
add_dependency(source);
FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
{
const SourcePackage &pkg = comp.get_package();
- FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+ FS::Path temp_dir = pkg.get_temp_directory()/comp.get_name();
+ FS::Path rel_src;
+ if(FS::descendant_depth(src, temp_dir)>=0)
+ rel_src = FS::relative(src, temp_dir);
+ else
+ rel_src = FS::relative(src, pkg.get_source_directory());
string fn;
for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
{
if(*i!=".")
fn += *i;
}
- return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
+ const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+ return temp_dir/arch.get_object_patterns().front().apply(FS::basepart(fn));
+}
+
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+ used_in_shlib = u;
+}
+
+void ObjectFile::collect_build_info(BuildInfo &binfo) const
+{
+ Target::collect_build_info(binfo);
+ binfo.update_from(component->get_build_info_for_path(source.get_path()));
}
void ObjectFile::find_dependencies()
}
else
{
+ FS::Path inst_dir = rtgt->get_component()->get_install_map().get_install_location(*rtgt);
/* The target has been displaced by installing it. Displace any
dependencies that come from the same package as well. */
const SourcePackage *tpkg = rtgt->get_package();
FileTarget *file = dynamic_cast<FileTarget *>(*i);
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());
+ const Component *tcomp = file->get_component();
+ FS::Path dep_inst = tcomp->get_install_map().get_install_location(*file);
+ FS::Path displaced = FS::dirname(tgt->get_path())/FS::relative(dep_inst, inst_dir)/FS::basename(file->get_path());
if(Target *ddep = builder.get_vfs().get_target(displaced))
deps_to_add.push_back(ddep);
else
{
- const Component *tcomp = file->get_component();
const Component::OverlayList &overlays = tcomp->get_overlays();
string last_dir = FS::basename(FS::dirname(displaced));
for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
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_dependency(**i);
+ if((*i)->get_real_target()->is_buildable())
+ (*i)->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
+ }
}