X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5104cdf3e92b04c8567304baae993bf974f9952c;hb=5ed38947b3fabd977a7f68b512115fe1456ea096;hp=4a889cb1750903209638a2cb2b8d8b3945847793;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 4a889cb..5104cdf 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -68,6 +68,25 @@ 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.libmode inst_list; string inst_loc; if(type==TARBALL) @@ -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,13 +138,14 @@ 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; + 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; @@ -133,7 +153,7 @@ void Component::create_targets() const 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,9 +167,9 @@ 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) @@ -172,7 +192,7 @@ void Component::create_targets() const } if(type==LIBRARY && install && dynamic_cast(src)->is_installable()) - inst_list.push_back(src); + build_graph.add_installed_target(*src); } } @@ -192,19 +212,11 @@ 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); - } } Component::SourceList Component::collect_source_files() const @@ -231,12 +243,33 @@ Component::SourceList 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"); +}