X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5104cdf3e92b04c8567304baae993bf974f9952c;hb=5ed38947b3fabd977a7f68b512115fe1456ea096;hp=f4c63a8dca5e06f71be5153e9c25b2d86194cea6;hpb=412ae5814ce6be4435572b31976977a457299ed1;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index f4c63a8..5104cdf 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,32 @@ 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); + build_info.libs.push_back((*i)->get_name()); + if(!(*i)->get_install()) + { + build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; + build_info.libpath.push_back((*i)->get_package().get_source_directory()); + } + } + 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()); @@ -85,10 +104,10 @@ void Component::create_build_info() void Component::create_targets() const { Builder &builder = package.get_builder(); + BuildGraph &build_graph = builder.get_build_graph(); const Toolchain &toolchain = builder.get_toolchain(); - PathList source_filenames = collect_source_files(); - list inst_list; + SourceList source_filenames = collect_source_files(); string inst_loc; if(type==TARBALL) @@ -96,7 +115,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) @@ -110,8 +129,8 @@ void Component::create_targets() const tarname = package.get_name()+"-"+package.get_version(); files.insert(files.begin(), &package.get_build_file()); - const Builder::TargetMap &targets = builder.get_targets(); - for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) + const BuildGraph::TargetMap &targets = build_graph.get_targets(); + for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) if(i->second->get_package()==&package && !i->second->is_buildable()) if(find(files.begin(), files.end(), i->second)==files.end()) files.push_back(i->second); @@ -119,21 +138,22 @@ void Component::create_targets() const Target *result = tar.create_target(files, tarname); - builder.get_target("tarballs")->add_dependency(*result); + build_graph.get_target("tarballs")->add_dependency(*result); return; } else if(type==INSTALL) { - inst_loc = name; - for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + Target *inst = build_graph.get_target("install"); + const Tool © = toolchain.get_tool("CP"); + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; if(Target *tgt = builder.get_vfs().get_target(*i)) ft = dynamic_cast(tgt); else ft = new File(builder, package, *i); - inst_list.push_back(ft); + inst->add_dependency(*copy.create_target(*ft, name)); } } else if(type==DATAFILE) @@ -147,15 +167,15 @@ void Component::create_targets() const source = new File(builder, package, source_filenames.front()); Target *result = dcomp.create_target(*source); - builder.add_primary_target(*result); + build_graph.add_primary_target(*result); if(install) - inst_list.push_back(result); + build_graph.add_installed_target(*result); } 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); @@ -171,8 +191,8 @@ void Component::create_targets() const objs.push_back(obj); } - if(type==LIBRARY && install && !dynamic_cast(src)->get_install_location().empty()) - inst_list.push_back(src); + if(type==LIBRARY && install && dynamic_cast(src)->is_installable()) + build_graph.add_installed_target(*src); } } @@ -192,25 +212,17 @@ void Component::create_targets() const for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { - builder.add_primary_target(**i); + build_graph.add_primary_target(**i); if(install) - inst_list.push_back(*i); + build_graph.add_installed_target(**i); } } - - Target *inst_tgt = builder.get_target("install"); - const Tool © = toolchain.get_tool("CP"); - for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) - { - Target *inst = copy.create_target(**i, inst_loc); - inst_tgt->add_dependency(*inst); - } } -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)) @@ -231,12 +243,33 @@ PathList Component::collect_source_files() const Component::Loader::Loader(Component &c): DataFile::ObjectLoader(c) { + add("if_arch", &Loader::if_arch); + add("if_feature", &Loader::if_feature); add("source", &Loader::source); add("install", &Component::install); add("install_map", &Loader::install_map); add("build_info", &Loader::build_info); add("require", &Loader::require); add("default", &Component::deflt); + add("use", &Loader::use); +} + +void Component::Loader::if_arch(const string &cond) +{ + bool match = obj.package.get_builder().get_current_arch().match_name(cond); + obj.package.get_builder().get_logger().log("configure", + format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not "))); + if(match) + load_sub_with(*this); +} + +void Component::Loader::if_feature(const string &cond) +{ + bool match = obj.package.match_feature(cond); + obj.package.get_builder().get_logger().log("configure", + format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not "))); + if(match) + load_sub_with(*this); } void Component::Loader::source(const string &s) @@ -260,3 +293,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"); +}