X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=bebe3f7790f4c6b20d874a6208e40583f2d6f083;hb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;hp=371e145a0369ab7f3a37a48131033d8446e567af;hpb=07503a34b80778fe74977f0fb0c2094c92d64ce0;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 371e145..bebe3f7 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -2,29 +2,16 @@ #include #include #include -#include -#include +#include #include "builder.h" #include "component.h" -#include "csourcefile.h" -#include "datapack.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,46 +46,13 @@ 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()); - } - } } BuildInfo Component::get_build_info_for_path(const FS::Path &path) const @@ -127,134 +81,6 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const return binfo; } -void Component::create_targets() const -{ - Builder &builder = package.get_builder(); - BuildGraph &build_graph = builder.get_build_graph(); - const Toolchain &toolchain = builder.get_toolchain(); - - SourceList source_filenames = collect_source_files(); - - string inst_loc; - if(type==TARBALL) - { - 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 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); - } - - Target *result = tar.create_target(files, tarname); - - build_graph.get_target("tarballs")->add_dependency(*result); - - return; - } - else if(type==INSTALL) - { - 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; - 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==DATAPACK) - { - const Tool &dcomp = toolchain.get_tool("DATA"); - - list files; - for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) - { - string ext = FS::extpart(FS::basename(*i)); - if(ext==".mdt") - { - Target *src = dcomp.create_source(*this, *i); - files.push_back(dcomp.create_target(*src, "collection")); - } - else if(Target *tgt = builder.get_vfs().get_target(*i)) - files.push_back(tgt); - else - files.push_back(new File(builder, package, *i)); - } - - Target *result = dcomp.create_target(files, "pack"); - - build_graph.add_primary_target(*result); - if(install) - build_graph.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) - { - 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()) - build_graph.add_installed_target(*src); - } - } - - 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) - { - build_graph.add_primary_target(**i); - if(install) - build_graph.add_installed_target(**i); - } - } -} - Component::SourceList Component::collect_source_files() const { SourceList files; @@ -271,12 +97,21 @@ Component::SourceList Component::collect_source_files() const 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 @@ -296,10 +131,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); @@ -307,7 +141,6 @@ 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::build_info() @@ -315,24 +148,6 @@ void Component::Loader::build_info() load_sub(obj.build_info); } -void Component::Loader::if_arch(const string &cond) -{ - 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::if_feature(const string &cond) -{ - 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() { load_sub(obj.install_map, obj.package.get_source_directory()); @@ -348,21 +163,11 @@ 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()); } - -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"); -}