X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=6bfce1fb6b8682f19c775552812b26af9da1b451;hb=fcb86bba9e8ea7e3c93f7f1748c0291b307c46ed;hp=3f8b004ce172af9a96b36ee6af13d7a586c6de75;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 3f8b004..6bfce1f 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -23,7 +23,7 @@ using namespace std; using namespace Msp; Component::Component(SourcePackage &p, Type t, const string &n): - pkg(p), + package(p), type(t), name(n), install(false), @@ -32,36 +32,54 @@ 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(); } void Component::create_build_info() { - const PackageList &pkg_reqs = pkg.get_requires(); - PackageList direct_reqs = requires; + BuildInfo final_build_info; + + 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; - build_info.update_from((*i)->get_exported_binfo(), level); + final_build_info.update_from((*i)->get_exported_build_info(), level); - const PackageList &reqs = (*i)->get_requires(); - 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); } - build_info.update_from(pkg.get_build_info()); + final_build_info.update_from(package.get_build_info()); for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); + *i = (package.get_source_directory() / *i).str(); for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); + *i = (package.get_source_directory() / *i).str(); + + 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_binfo(); + const BuildInfo &ebi = (*i)->get_exported_build_info(); build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); } } @@ -79,62 +97,55 @@ void Component::create_build_info() void Component::create_targets() const { - Builder &builder = pkg.get_builder(); + Builder &builder = package.get_builder(); const Toolchain &toolchain = builder.get_toolchain(); - Target *world = builder.get_target("world"); - Target *def_tgt = builder.get_target("default"); - PathList source_filenames = collect_source_files(); + SourceList source_filenames = collect_source_files(); list inst_list; string inst_loc; if(type==TARBALL) { - //const Tool &tar = toolchain.get_tool("TAR"); - - string tarname = name; - if(name=="@src") - { - tarname = pkg.get_name()+"-"+pkg.get_version(); - source_filenames.push_back(pkg.get_source()/"Build"); - } + 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) - file = new File(builder, *i); + file = new File(builder, package, *i); files.push_back(file); } + string tarname = name; if(name=="@src") { + 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) - if(i->second->get_package()==&pkg && !i->second->is_buildable()) - files.push_back(i->second); + 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); } - /* XXX The source files don't have a package at the moment, so we can't - create the tarball target until things get fixed up a bit */ - /*Target *result = tar.create_target(files, tarname); + Target *result = tar.create_target(files, tarname); - Target *tarballs_tgt = builder.get_target("tarballs"); - tarballs_tgt->add_depend(*result);*/ + builder.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) + 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, pkg, *i); + ft = new File(builder, package, *i); inst_list.push_back(ft); } } @@ -146,13 +157,10 @@ void Component::create_targets() const if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) source = dynamic_cast(tgt); else - source = new File(builder, pkg, source_filenames.front()); + source = new File(builder, package, source_filenames.front()); Target *result = dcomp.create_target(*source); - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(*result); - else - world->add_depend(*result); + builder.add_primary_target(*result); if(install) inst_list.push_back(result); } @@ -160,20 +168,23 @@ 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); if(tool) { Target *src = tool->create_source(*this, *i); + if(!src) + continue; + if(tool->accepts_suffix(ext)) { Target *obj = tool->create_target(*src); objs.push_back(obj); } - if(type==LIBRARY && install && !dynamic_cast(src)->get_install_location().empty()) + if(type==LIBRARY && install && dynamic_cast(src)->is_installable()) inst_list.push_back(src); } } @@ -192,12 +203,27 @@ 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) { - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(**i); - else - world->add_depend(**i); + builder.add_primary_target(**i); if(install) inst_list.push_back(*i); } @@ -208,19 +234,19 @@ void Component::create_targets() const for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) { Target *inst = copy.create_target(**i, inst_loc); - inst_tgt->add_depend(*inst); + 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)) { - pkg.get_builder().get_logger().log("files", format("Traversing %s", path)); + package.get_builder().get_logger().log("files", format("Traversing %s", path)); list sfiles = list_files(path); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) files.push_back(path / *j); @@ -242,16 +268,17 @@ 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) { - obj.sources.push_back((obj.pkg.get_source()/s).str()); + obj.sources.push_back((obj.package.get_source_directory()/s).str()); } void Component::Loader::require(const string &n) { - Package *req = obj.pkg.get_builder().get_package_manager().find_package(n); + Package *req = obj.package.get_builder().get_package_manager().find_package(n); if(req) obj.requires.push_back(req); } @@ -263,5 +290,17 @@ void Component::Loader::build_info() void Component::Loader::install_map() { - load_sub(obj.install_map, obj.pkg.get_source()); + 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"); }