-#include <algorithm>
+#include <msp/core/algorithm.h>
#include <msp/fs/utils.h>
#include "builder.h"
#include "component.h"
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();
+ 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)
+ for(const string &c: rel_src)
{
if(!fn.empty())
fn += '_';
- if(*i!=".")
- fn += *i;
+ if(c!=".")
+ fn += c;
}
- 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/comp.get_name()/arch.create_filename<ObjectFile>(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()
{
- for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+ vector<FileTarget *> headers;
+ find_dependencies(source, headers);
+ for(FileTarget *h: headers)
{
- (*i)->prepare();
- find_dependencies(dynamic_cast<FileTarget *>(*i));
+ add_dependency(*h);
+ if(h->get_real_target()->is_buildable())
+ h->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
}
}
-void ObjectFile::find_dependencies(FileTarget *tgt)
+void ObjectFile::find_dependencies(FileTarget &tgt, vector<FileTarget *> &headers)
{
- FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
- const Dependencies &tdeps = rtgt->get_dependencies();
- Dependencies deps_to_add;
- if(rtgt==tgt)
- {
- /* We are using the target from its original location, so dependencies
- apply directly */
- deps_to_add = tdeps;
- }
- else
+ tgt.prepare();
+
+ FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt.get_real_target());
+ Dependencies deps_to_add = rtgt->get_transitive_dependencies();
+ if(rtgt!=&tgt)
{
+ 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();
- for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
+ for(Target *&d: deps_to_add)
{
- FileTarget *file = dynamic_cast<FileTarget *>(*i);
+ FileTarget *file = dynamic_cast<FileTarget *>(d);
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))
- deps_to_add.push_back(ddep);
- else
+ 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());
+ d = builder.get_vfs().get_target(displaced);
+ if(!d)
{
- const Component *tcomp = file->get_component();
- const Component::OverlayList &overlays = tcomp->get_overlays();
+ /* If the target was in an overlay directory and the displaced
+ dependency is not found, try removing the overlay from the path. */
string last_dir = FS::basename(FS::dirname(displaced));
- for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
- if(last_dir==*j)
- {
- displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
- if((ddep = builder.get_vfs().get_target(displaced)))
- deps_to_add.push_back(ddep);
- }
+ if(any_equals(tcomp->get_overlays(), last_dir))
+ {
+ displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
+ d = builder.get_vfs().get_target(displaced);
+ }
}
}
- else
- deps_to_add.push_back(*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_dependency(**i);
+ for(Target *d: deps_to_add)
+ if(FileTarget *file = dynamic_cast<FileTarget *>(d))
+ {
+ auto i = lower_bound(headers, file);
+ if(i==headers.end() || *i!=file)
+ {
+ headers.insert(i, file);
+ find_dependencies(*file, headers);
+ }
+ }
}
projects / builder.git / blobdiff