X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=48675f7e5d7c0148cc2752f39f6946ff163a9f32;hb=65ba6a595dd4a1d74675abcfdf96307062dc43eb;hp=feb5094b27a071fa8823eabd4e09c2fae466a11d;hpb=62ad932589407842cc1026af6e6d9f4012e60c67;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index feb5094..48675f7 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); } } @@ -190,39 +210,13 @@ 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); + 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 @@ -249,6 +243,8 @@ 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); @@ -258,21 +254,27 @@ Component::Loader::Loader(Component &c): add("use", &Loader::use); } -void Component::Loader::source(const string &s) +void Component::Loader::build_info() { - obj.sources.push_back((obj.package.get_source_directory()/s).str()); + load_sub(obj.build_info); } -void Component::Loader::require(const string &n) +void Component::Loader::if_arch(const string &cond) { - Package *req = obj.package.get_builder().get_package_manager().find_package(n); - if(req) - obj.requires.push_back(req); + 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::build_info() +void Component::Loader::if_feature(const string &cond) { - load_sub(obj.build_info); + 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::install_map() @@ -280,6 +282,18 @@ void Component::Loader::install_map() load_sub(obj.install_map, obj.package.get_source_directory()); } +void Component::Loader::require(const string &n) +{ + Package *req = obj.package.get_builder().get_package_manager().find_package(n); + if(req) + obj.requires.push_back(req); +} + +void Component::Loader::source(const string &s) +{ + obj.sources.push_back((obj.package.get_source_directory()/s).str()); +} + void Component::Loader::use(const string &n) { const SourcePackage::ComponentList &components = obj.package.get_components(); @@ -289,5 +303,5 @@ void Component::Loader::use(const string &n) obj.uses.push_back(&*i); return; } - error(format("Unknown library component '%s'", n)); + throw invalid_argument("Component::Loader::use"); }