X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=6545b28b95c460ed9b1f34b8ca679cd8aa77e677;hb=9f885c3eec8f065b7dc400acfb9dd67158284fcf;hp=3c5a40945ed56184e4776edd7cb74b0ec3ee5b91;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 3c5a409..6545b28 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,244 +1,142 @@ -#include +#include +#include #include #include #include -#include -#include +#include #include "builder.h" #include "component.h" -#include "csourcefile.h" -#include "datafile.h" -#include "executable.h" -#include "file.h" -#include "objectfile.h" -#include "sharedlibrary.h" #include "sourcepackage.h" -#include "staticlibrary.h" -#include "tarball.h" -#include "target.h" -#include "tool.h" -#include "toolchain.h" using namespace std; using namespace Msp; -Component::Component(SourcePackage &p, Type t, const string &n): - pkg(p), - type(t), +Component::Component(SourcePackage &p, const string &n): + package(p), name(n), install(false), deflt(true) { } -void Component::configure(const StringMap &opts, unsigned flag) +void Component::prepare() { - for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i) - *i = (pkg.get_source()/pkg.expand_string(*i)).str(); - - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) - (*i)->configure(opts, flag&2); + for(Package *r: requires) + r->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()); + for(Package *r: direct_reqs) + final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY); - PackageList all_reqs = direct_reqs; - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + Package::Requirements all_reqs = direct_reqs; + deque queue(direct_reqs.begin(), direct_reqs.end()); + while(!queue.empty()) { - 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); + Package *req = queue.front(); + queue.pop_front(); - const PackageList &reqs = (*i)->get_requires(); - for(PackageList::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); + for(Package *r: req->get_required_packages()) + if(!any_equals(all_reqs, r)) + { + final_build_info.update_from(r->get_exported_build_info(), BuildInfo::CHAINED); + all_reqs.push_back(r); + queue.push_back(r); + } } - build_info.update_from(pkg.get_build_info()); - - for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); - for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); - - if(pkg.get_library_mode()!=DYNAMIC) - { - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) - { - const BuildInfo &ebi = (*i)->get_exported_binfo(); - build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); - } - } + final_build_info.update_from(package.get_build_info()); + final_build_info.update_from(build_info); + build_info = final_build_info; - if(type==PROGRAM) - build_info.strip = lexical_cast(pkg.get_config().get_option("strip").value); + for(FS::Path &p: build_info.incpath) + p = (package.get_source_directory()/p).str(); + for(FS::Path &p: build_info.libpath) + p = (package.get_source_directory()/p).str(); } -void Component::create_targets() const +BuildInfo Component::get_build_info_for_path(const FS::Path &path) const { - Builder &builder = pkg.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(); - 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"); - } - - list files; - for(PathList::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); - files.push_back(file); - } - - if(name=="@src") - { - 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); - } - - /* 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); + // XXX Cache these and check that the directories actually exist before adding them + BuildInfo binfo = build_info; - Target *tarballs_tgt = builder.get_target("tarballs"); - tarballs_tgt->add_depend(result);*/ - - return; - } - else if(type==INSTALL) - { - inst_loc = name; - for(PathList::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); - inst_list.push_back(ft); - } - } - else if(type==DATAFILE) + FS::Path gen_dir = package.get_temp_directory()/"generated"; + if(FS::descendant_depth(path, gen_dir)>=0) { - const Tool &dcomp = toolchain.get_tool("DATA"); - - File *source; - if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) - source = dynamic_cast(tgt); - else - source = new File(builder, pkg, 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); - if(install) - inst_list.push_back(result); + FS::Path subdir = FS::dirname(FS::relative(path, gen_dir)); + binfo.local_incpath.push_back(package.get_source_directory()/subdir); } else { - for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) - { - string ext = FS::extpart(FS::basename(*i)); - if(ext==".h") - { - FileTarget *hdr = builder.get_vfs().get_target(*i); - if(!hdr) - hdr = new CSourceFile(builder, *this, *i); - - // Install headers if requested - if(type==HEADERS && install) - inst_list.push_back(hdr); - } - } + FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory())); + binfo.local_incpath.push_back(gen_dir/subdir); } - if(type==PROGRAM || type==LIBRARY || type==MODULE) + if(!overlays.empty()) { - list objs; - for(PathList::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); - if(tool) - { - Target *src = tool->create_source(*this, *i); - Target *obj = tool->create_target(*src); - objs.push_back(obj); - } - } - - const Tool &linker = toolchain.get_tool("LINK"); - - list results; - if(type==LIBRARY) - { - const Tool &archiver = toolchain.get_tool("AR"); - results.push_back(linker.create_target(objs, "shared")); - results.push_back(archiver.create_target(objs)); - } - else if(type==MODULE) - results.push_back(linker.create_target(objs, "shared")); - else - results.push_back(linker.create_target(objs)); + FS::Path dir = FS::dirname(path); + string last = FS::basename(dir); + if(any_equals(overlays, last)) + dir = FS::dirname(dir); - for(list::const_iterator i=results.begin(); i!=results.end(); ++i) + if(any_equals(sources, dir)) { - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(*i); - else - world->add_depend(*i); - if(install) - inst_list.push_back(*i); + binfo.local_incpath.push_back(dir); + for(const string &o: overlays) + binfo.local_incpath.push_back(dir/o); } } - - 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_depend(inst); - } + return binfo; } -PathList Component::collect_source_files() const +list Component::collect_source_files() const { - PathList files; - for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + list files; + for(const FS::Path &p: sources) { - FS::Path path(*i); - if(FS::is_dir(path)) + if(FS::is_dir(p)) { - list sfiles = list_files(path); - for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) - files.push_back(path / *j); + list dirs; + dirs.push_back(p); + for(const string &o: overlays) + { + FS::Path opath = p/o; + if(FS::is_dir(opath)) + dirs.push_back(opath); + } + set overlay_files; + for(auto j=dirs.begin(); j!=dirs.end(); ++j) + { + package.get_builder().get_logger().log("files", format("Traversing %s", *j)); + for(const string &f: list_files(*j)) + { + if(j!=dirs.begin()) + { + if(overlay_files.count(f)) + continue; + overlay_files.insert(f); + } + FS::Path fn = *j/f; + if(!FS::is_dir(fn)) + files.push_back(fn); + } + } } else - files.push_back(path); + { + files.push_back(p); + for(const string &o: overlays) + { + FS::Path opath = FS::dirname(p)/o/FS::basename(p); + if(FS::is_reg(opath)) + files.push_back(opath); + } + } } return files; @@ -246,8 +144,10 @@ PathList Component::collect_source_files() const Component::Loader::Loader(Component &c): - comp(c) + DataFile::ObjectLoader(c), + ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name)) { + add("overlay", &Loader::overlay); add("source", &Loader::source); add("install", &Component::install); add("install_map", &Loader::install_map); @@ -256,35 +156,31 @@ Component::Loader::Loader(Component &c): add("default", &Component::deflt); } -void Component::Loader::finish() +void Component::Loader::build_info() { - if(!inst_hdr.empty()) - { - Component hdrcomp(comp.pkg, HEADERS, inst_hdr); - hdrcomp.sources = comp.sources; - hdrcomp.install = true; - const_cast(comp.pkg.get_components()).push_back(hdrcomp); - } + load_sub(obj.build_info); } -void Component::Loader::source(const string &s) +void Component::Loader::install_map() { - comp.sources.push_back(s); + load_sub(obj.install_map, obj.package.get_source_directory()); } -void Component::Loader::require(const string &n) +void Component::Loader::overlay(const string &o) { - Package *req = comp.pkg.get_builder().get_package_manager().find_package(n); - if(req) - comp.requires.push_back(req); + obj.overlays.push_back(o); } -void Component::Loader::build_info() +void Component::Loader::require(const string &n) { - load_sub(comp.build_info); + Package *req = obj.package.get_builder().get_package_manager().find_package(n); + if(req) + obj.requires.push_back(req); + else + obj.problems.push_back(format("Required package %s not found", n)); } -void Component::Loader::install_map() +void Component::Loader::source(const string &s) { - load_sub(comp.install_map, comp.pkg.get_source()); + obj.sources.push_back((obj.package.get_source_directory()/s).str()); }