X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=c12399f670f944e2a22f953862f3763ba05ff795;hb=0c83b922e56976a30506d9f8d43c9dcd38d573b5;hp=cf4234607e978d1f6399a2732adaded39496602d;hpb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index cf42346..c12399f 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,11 +1,4 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include +#include #include #include #include @@ -22,7 +15,6 @@ Distributed under the LGPL #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" -#include "symlink.h" #include "tarball.h" #include "target.h" @@ -34,17 +26,44 @@ Component::Component(SourcePackage &p, Type t, const string &n): type(t), name(n), install(false), - module_host(0), - modular(false), deflt(true) { } +void Component::configure(const StringMap &opts, unsigned flag) +{ + 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); +} + void Component::create_build_info() { - build_info.add(pkg.get_build_info()); + const PackageList &pkg_reqs = pkg.get_requires(); + PackageList direct_reqs = requires; + direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end()); + + PackageList all_reqs = direct_reqs; + for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + { + if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end()) + build_info.add((*i)->get_exported_binfo()); + else + { + const BuildInfo &ebi = (*i)->get_exported_binfo(); + build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end()); + build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end()); + build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end()); + } - for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) - build_info.add((*i)->get_exported_binfo()); + 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); + } + + build_info.add(pkg.get_build_info()); for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) *i = (pkg.get_source() / *i).str(); @@ -53,9 +72,7 @@ void Component::create_build_info() if(pkg.get_library_mode()!=DYNAMIC) { - // XXX This may pull in some unnecessary libpaths too. More thought required. - PackageList reqs = pkg.collect_requires(); - for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i) + 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()); @@ -73,18 +90,6 @@ void Component::create_build_info() build_info.cflags.push_back("-fPIC"); } - if(modular) - { - build_info.ldflags.push_back("-rdynamic"); - build_info.libs.push_back("dl"); - } - else if(module_host) - { - const PathList &host_src = module_host->get_sources(); - for(PathList::const_iterator i=host_src.begin(); i!=host_src.end(); ++i) - build_info.incpath.push_back(i->str()); - } - build_info.unique(); } @@ -107,8 +112,8 @@ void Component::create_targets() const if(name=="@src") { - const TargetMap &targets = builder.get_targets(); - for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) + 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()) result->add_depend(i->second); files.push_back(pkg.get_source()/"Build"); @@ -117,7 +122,7 @@ void Component::create_targets() const for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) + if(Target *tgt = builder.get_target_by_path(*i)) ft = dynamic_cast(tgt); else ft = new File(builder, *i); @@ -135,7 +140,7 @@ void Component::create_targets() const for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) + if(Target *tgt = builder.get_target_by_path(*i)) ft = dynamic_cast(tgt); else ft = new File(builder, pkg, *i); @@ -145,7 +150,7 @@ void Component::create_targets() const else if(type==DATAFILE) { File *source; - if(Target *tgt = builder.get_target(files.front().str())) + if(Target *tgt = builder.get_target_by_path(files.front())) source = dynamic_cast(tgt); else source = new File(builder, pkg, files.front()); @@ -165,7 +170,7 @@ void Component::create_targets() const string ext = FS::extpart(FS::basename(*i)); if(ext==".h") { - FileTarget *hdr = dynamic_cast(builder.get_target(i->str())); + FileTarget *hdr = builder.get_target_by_path(*i); if(!hdr) hdr = new Header(builder, *this, i->str()); @@ -215,26 +220,23 @@ void Component::create_targets() const { Install *inst = new Install(builder, pkg, **i, inst_loc); inst_tgt->add_depend(inst); - - if(type==LIBRARY) - if(SharedLibrary *shlib = dynamic_cast(*i)) - inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name())); } } PathList Component::collect_source_files() const { PathList files; - for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) { - if(FS::is_dir(*i)) + FS::Path path(*i); + if(FS::is_dir(path)) { - list sfiles = list_files(*i); + list sfiles = list_files(path); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) - files.push_back(*i / *j); + files.push_back(path / *j); } else - files.push_back(*i); + files.push_back(path); } return files; @@ -267,7 +269,7 @@ void Component::Loader::finish() void Component::Loader::source(const string &s) { - comp.sources.push_back(comp.pkg.get_source()/s); + comp.sources.push_back(s); } void Component::Loader::require(const string &n) @@ -279,24 +281,14 @@ void Component::Loader::require(const string &n) void Component::Loader::modular() { - if(comp.type!=PROGRAM) - throw Exception("Only programs can be modular"); - comp.modular = true; + IO::print("%s: Note: modular is deprecated\n", get_source()); + comp.build_info.ldflags.push_back("-rdynamic"); + comp.build_info.libs.push_back("dl"); } -void Component::Loader::host(const string &n) +void Component::Loader::host(const string &) { - const ComponentList &comps = comp.pkg.get_components(); - for(ComponentList::const_iterator i=comps.begin(); i!=comps.end(); ++i) - if(i->get_name()==n) - { - if(i->get_type()!=PROGRAM || !i->is_modular()) - throw Exception("Module host must be a modular program"); - comp.module_host = &*i; - return; - } - - throw KeyError("Unknown component", n); + IO::print("%s: Note: host is deprecated\n", get_source()); } void Component::Loader::install_headers(const string &p)