X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=a42b81cded44229d877882c535b11c2982ecfb77;hb=2f5311c7ed2735926b6fb107a657e77ac331e4c1;hp=68c9b1800097ad6ef014ae5b5a86122e52d392cf;hpb=894c4bd9d58df50c38c7a656cf085c48581439ef;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 68c9b18..a42b81c 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -4,27 +4,16 @@ #include #include #include +#include "booleanevaluator.h" #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): +Component::Component(SourcePackage &p, const string &n): package(p), - type(t), name(n), install(false), deflt(true) @@ -59,163 +48,39 @@ void Component::create_build_info() } 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(); - - 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.libmodeget_exported_build_info(); - build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); - } - } } -void Component::create_targets() const +BuildInfo Component::get_build_info_for_path(const FS::Path &path) const { - Builder &builder = package.get_builder(); - const Toolchain &toolchain = builder.get_toolchain(); - - SourceList source_filenames = collect_source_files(); - - string inst_loc; - if(type==TARBALL) + // XXX Cache these and check that the directories actually exist before adding them + BuildInfo binfo = build_info; + if(!overlays.empty()) { - const Tool &tar = toolchain.get_tool("TAR"); - - list files; - 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, 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()==&package && !i->second->is_buildable()) - if(find(files.begin(), files.end(), i->second)==files.end()) - files.push_back(i->second); - } - - Target *result = tar.create_target(files, tarname); - - builder.get_target("tarballs")->add_dependency(*result); - - return; - } - else if(type==INSTALL) - { - Target *inst = builder.get_target("install"); - const Tool © = toolchain.get_tool("CP"); - 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, package, *i); - inst->add_dependency(*copy.create_target(*ft, name)); - } - } - else if(type==DATAFILE) - { - 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, package, source_filenames.front()); - Target *result = dcomp.create_target(*source); - - builder.add_primary_target(*result); - if(install) - builder.add_installed_target(*result); - } - - if(type==PROGRAM || type==LIBRARY || type==MODULE) - { - list objs; - 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) + 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) { - 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)->is_installable()) - builder.add_installed_target(*src); + dir = FS::dirname(dir); + break; } - } - - 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)); - for(list::const_iterator i=results.begin(); i!=results.end(); ++i) - { - builder.add_primary_target(**i); - if(install) - builder.add_installed_target(**i); - } + 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); + } } + return binfo; } Component::SourceList Component::collect_source_files() const @@ -226,13 +91,41 @@ Component::SourceList Component::collect_source_files() const FS::Path path(*i); if(FS::is_dir(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); + SourceList dirs; + dirs.push_back(path); + for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + { + FS::Path opath = path / *j; + if(FS::is_dir(opath)) + dirs.push_back(opath); + } + set overlay_files; + for(SourceList::const_iterator 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) + { + if(j!=dirs.begin()) + { + if(overlay_files.count(*k)) + continue; + overlay_files.insert(*k); + } + files.push_back(*j / *k); + } + } } else + { files.push_back(path); + for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + { + FS::Path opath = FS::dirname(path)/ *j/FS::basename(path); + if(FS::is_reg(opath)) + files.push_back(opath); + } + } } return files; @@ -242,30 +135,40 @@ 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("overlay", &Loader::overlay); 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::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); + 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::build_info() +void Component::Loader::if_feature(const string &cond) { - load_sub(obj.build_info); + 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() @@ -273,14 +176,21 @@ void Component::Loader::install_map() load_sub(obj.install_map, obj.package.get_source_directory()); } -void Component::Loader::use(const string &n) +void Component::Loader::overlay(const string &o) { - 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"); + obj.overlays.push_back(o); +} + +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); + else + obj.problems.push_back(format("Required package %s not found", n)); +} + +void Component::Loader::source(const string &s) +{ + obj.sources.push_back((obj.package.get_source_directory()/s).str()); }