X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fcomponent.cpp;h=833a0ed20d507b665d59d9022dac7521bdce81d0;hp=4e7f547f36f7d05b9212a09f957907e1c79c75a8;hb=35f2979869bff43706f3163ec0979c7084aaa3c4;hpb=ec0d6014aa2db4a02588c9027e7dba17507df364 diff --git a/source/component.cpp b/source/component.cpp index 4e7f547..833a0ed 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -7,25 +7,13 @@ #include "booleanevaluator.h" #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) @@ -67,29 +55,6 @@ void Component::create_build_info() *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(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.libmode 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"); - 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) - { - 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; - const Toolchain &pkg_tools = package.get_toolchain(); - for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) - { - string ext = FS::extpart(FS::basename(*i)); - Target *src = 0; - - Tool *gen = pkg_tools.get_tool_for_suffix(ext); - if(gen) - { - Target *tmpl = gen->create_source(*this, *i); - if(tmpl) - { - src = gen->create_target(*tmpl); - ext = FS::extpart(FS::basename(dynamic_cast(*src).get_path())); - } - } - - Tool *tool = toolchain.get_tool_for_suffix(ext, true); - if(tool) - { - if(!src) - 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) - { - if(dynamic_cast(src)->is_installable()) - build_graph.add_installed_target(*src); - - const Target::Dependencies &side_effects = src->get_side_effects(); - for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j) - if(dynamic_cast(*j)->is_installable()) - build_graph.add_installed_target(**j); - } - } - } - - Tool &linker = toolchain.get_tool("LINK"); - - list results; - if(type==LIBRARY) - { - 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; @@ -321,7 +135,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() @@ -372,15 +185,3 @@ 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"); -}