X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=e3f80fbc95b9becfd93c89ec9968784783d90dbf;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=833a0ed20d507b665d59d9022dac7521bdce81d0;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 833a0ed..e3f80fb 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,10 +1,9 @@ -#include +#include +#include #include #include #include -#include -#include -#include "booleanevaluator.h" +#include #include "builder.h" #include "component.h" #include "sourcepackage.h" @@ -21,8 +20,8 @@ Component::Component(SourcePackage &p, const string &n): void Component::prepare() { - for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) - (*i)->prepare(); + for(Package *r: requires) + r->prepare(); } void Component::create_build_info() @@ -32,87 +31,109 @@ void Component::create_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); Package::Requirements all_reqs = direct_reqs; - for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + 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; - final_build_info.update_from((*i)->get_exported_build_info(), level); - - 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); + Package *req = queue.front(); + queue.pop_front(); + + 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); + } } final_build_info.update_from(package.get_build_info()); final_build_info.update_from(build_info); build_info = final_build_info; - for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) - *i = (package.get_source_directory() / *i).str(); - for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i = (package.get_source_directory() / *i).str(); + 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(); } BuildInfo Component::get_build_info_for_path(const FS::Path &path) const { // XXX Cache these and check that the directories actually exist before adding them BuildInfo binfo = build_info; + + FS::Path gen_dir = package.get_temp_directory()/"generated"; + if(FS::descendant_depth(path, gen_dir)>=0) + { + FS::Path subdir = FS::dirname(FS::relative(path, gen_dir)); + binfo.local_incpath.push_back(package.get_source_directory()/subdir); + } + else + { + FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory())); + binfo.local_incpath.push_back(gen_dir/subdir); + } + if(!overlays.empty()) { FS::Path dir = FS::dirname(path); string last = FS::basename(dir); - for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i) - if(last==*i) - { - dir = FS::dirname(dir); - break; - } + if(any_equals(overlays, last)) + dir = FS::dirname(dir); - for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) - if(dir==*i) - { - binfo.local_incpath.push_back(dir); - for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) - binfo.local_incpath.push_back(*i/ *j); - } + if(any_equals(sources, dir)) + { + binfo.local_incpath.push_back(dir); + for(const string &o: overlays) + binfo.local_incpath.push_back(dir/o); + } } return binfo; } -Component::SourceList Component::collect_source_files() const +vector Component::collect_source_files() const { - SourceList files; - for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + vector files; + for(const FS::Path &p: sources) { - FS::Path path(*i); - if(FS::is_dir(path)) + if(FS::is_dir(p)) { - SourceList dirs; - dirs.push_back(path); - for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + vector dirs; + dirs.reserve(1+overlays.size()); + dirs.push_back(p); + for(const string &o: overlays) { - FS::Path opath = path / *j; + FS::Path opath = p/o; if(FS::is_dir(opath)) dirs.push_back(opath); } - for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j) + set overlay_files; + for(auto j=dirs.begin(); j!=dirs.end(); ++j) { - package.get_builder().get_logger().log("files", format("Traversing %s", *j)); - list sfiles = list_files(*j); - for(list::iterator k=sfiles.begin(); k!=sfiles.end(); ++k) - files.push_back(*j / *k); + package.get_builder().get_logger().log("files", "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); - for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + files.push_back(p); + for(const string &o: overlays) { - FS::Path opath = FS::dirname(path)/ *j/FS::basename(path); + FS::Path opath = FS::dirname(p)/o/FS::basename(p); if(FS::is_reg(opath)) files.push_back(opath); } @@ -124,10 +145,9 @@ Component::SourceList Component::collect_source_files() const Component::Loader::Loader(Component &c): - DataFile::ObjectLoader(c) + DataFile::ObjectLoader(c), + ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name)) { - add("if_arch", &Loader::if_arch); - add("if_feature", &Loader::if_feature); add("overlay", &Loader::overlay); add("source", &Loader::source); add("install", &Component::install); @@ -142,26 +162,6 @@ void Component::Loader::build_info() load_sub(obj.build_info); } -void Component::Loader::if_arch(const string &cond) -{ - BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false); - bool match = eval.evaluate(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) -{ - BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature)); - bool match = eval.evaluate(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() { load_sub(obj.install_map, obj.package.get_source_directory());