X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=6bfce1fb6b8682f19c775552812b26af9da1b451;hb=fcb86bba9e8ea7e3c93f7f1748c0291b307c46ed;hp=a63e3b05d371571af52888dce3b8a8a2f749138b;hpb=1ff899633e05aa28392c0352ab2d9239d017159e;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index a63e3b0..6bfce1f 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -32,7 +32,7 @@ Component::Component(SourcePackage &p, Type t, const string &n): void Component::prepare() { - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) + for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) (*i)->prepare(); } @@ -40,20 +40,20 @@ void Component::create_build_info() { BuildInfo final_build_info; - const PackageList &pkg_reqs = package.get_required_packages(); - PackageList direct_reqs = requires; + const Package::Requirements &pkg_reqs = package.get_required_packages(); + Package::Requirements direct_reqs = requires; direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end()); - PackageList all_reqs = direct_reqs; - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + Package::Requirements all_reqs = direct_reqs; + for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { BuildInfo::UpdateLevel level = BuildInfo::CHAINED; if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end()) level = BuildInfo::DEPENDENCY; final_build_info.update_from((*i)->get_exported_build_info(), level); - const PackageList &reqs = (*i)->get_required_packages(); - for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) + const Package::Requirements &reqs = (*i)->get_required_packages(); + for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end()) all_reqs.push_back(*j); } @@ -68,13 +68,26 @@ void Component::create_build_info() final_build_info.update_from(build_info); build_info = final_build_info; + for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) + { + /* Select an include path that contains all the sources for this and the + used component. This should produce a sensible result in most cases. */ + FS::Path base; + for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j) + base = base.empty() ? *j : FS::common_ancestor(base, *j); + const SourceList &use_sources = (*i)->get_sources(); + for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j) + base = FS::common_ancestor(base, *j); + build_info.incpath.push_back(base); + } + if(type==LIBRARY || type==MODULE) if(build_info.libmodeget_exported_build_info(); build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); @@ -87,7 +100,7 @@ void Component::create_targets() const Builder &builder = package.get_builder(); const Toolchain &toolchain = builder.get_toolchain(); - PathList source_filenames = collect_source_files(); + SourceList source_filenames = collect_source_files(); list inst_list; string inst_loc; @@ -96,7 +109,7 @@ void Component::create_targets() const const Tool &tar = toolchain.get_tool("TAR"); list files; - for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *file = builder.get_vfs().get_target(*i); if(!file) @@ -126,7 +139,7 @@ void Component::create_targets() const else if(type==INSTALL) { inst_loc = name; - for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; if(Target *tgt = builder.get_vfs().get_target(*i)) @@ -155,7 +168,7 @@ void Component::create_targets() const if(type==PROGRAM || type==LIBRARY || type==MODULE) { list objs; - for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); const Tool *tool = toolchain.get_tool_for_suffix(ext, true); @@ -190,6 +203,24 @@ void Component::create_targets() const else results.push_back(linker.create_target(objs)); + const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies(); + for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) + { + /* The world target depends on all primary targets; look for the + static library belonging to the component. This is a bit roundabout + way but gets the job done. */ + bool found = false; + for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j) + if((*j)->get_component()==*i && dynamic_cast(*j)) + { + results.front()->add_dependency(**j); + found = true; + break; + } + if(!found) + builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name)); + } + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { builder.add_primary_target(**i); @@ -207,10 +238,10 @@ void Component::create_targets() const } } -PathList Component::collect_source_files() const +Component::SourceList Component::collect_source_files() const { - PathList files; - for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + SourceList files; + for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) { FS::Path path(*i); if(FS::is_dir(path)) @@ -237,6 +268,7 @@ Component::Loader::Loader(Component &c): add("build_info", &Loader::build_info); add("require", &Loader::require); add("default", &Component::deflt); + add("use", &Loader::use); } void Component::Loader::source(const string &s) @@ -260,3 +292,15 @@ void Component::Loader::install_map() { load_sub(obj.install_map, obj.package.get_source_directory()); } + +void Component::Loader::use(const string &n) +{ + const SourcePackage::ComponentList &components = obj.package.get_components(); + for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) + if(i->get_name()==n && i->get_type()==LIBRARY) + { + obj.uses.push_back(&*i); + return; + } + throw invalid_argument("Component::Loader::use"); +}