X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=ea53d23ea94693fb35e79a290bd5a9364215b018;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=26ce71058dfd79edf38b5006e2d5620cd82261b3;hpb=b3ce9052ba98a4585aec75117265d170b7ccfdb8;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 26ce710..ea53d23 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,11 +1,4 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include +#include #include #include #include @@ -22,6 +15,7 @@ Distributed under the LGPL #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" +#include "symlink.h" #include "tarball.h" #include "target.h" @@ -33,51 +27,68 @@ 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()); - for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) - build_info.add((*i)->get_exported_binfo()); + 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()); + } + + 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(); + *i = (pkg.get_source() / *i).str(); for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i=(pkg.get_source() / *i).str(); + *i = (pkg.get_source() / *i).str(); 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(); + const BuildInfo &ebi = (*i)->get_exported_binfo(); build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); } } if(type==PROGRAM) { - string strip=pkg.get_config().get_option("strip").value; + string strip = pkg.get_config().get_option("strip").value; if(lexical_cast(strip)) build_info.ldflags.push_back("-s"); } - - if(modular) - { - build_info.ldflags.push_back("-rdynamic"); - build_info.libs.push_back("dl"); - } - else if(module_host) + else if(type==LIBRARY) { - 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.cflags.push_back("-fPIC"); } build_info.unique(); @@ -85,24 +96,24 @@ void Component::create_build_info() void Component::create_targets() const { - Builder &builder=pkg.get_builder(); - Target *world=builder.get_target("world"); - Target *def_tgt=builder.get_target("default"); + Builder &builder = pkg.get_builder(); + Target *world = builder.get_target("world"); + Target *def_tgt = builder.get_target("default"); - PathList files=collect_source_files(); + PathList files = collect_source_files(); list inst_list; string inst_loc; if(type==TARBALL) { - string tarname=name; + string tarname = name; if(name=="@src") - tarname=pkg.get_name()+"-"+pkg.get_version(); - TarBall *result=new TarBall(builder, pkg, tarname); + tarname = pkg.get_name()+"-"+pkg.get_version(); + TarBall *result = new TarBall(builder, pkg, tarname); if(name=="@src") { - const TargetMap &targets=builder.get_targets(); + const TargetMap &targets = builder.get_targets(); for(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); @@ -112,51 +123,57 @@ 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())) - ft=dynamic_cast(tgt); + if(Target *tgt = builder.get_target(i->str())) + ft = dynamic_cast(tgt); else - ft=new File(builder, *i); + ft = new File(builder, *i); result->add_depend(ft); } - Target *tarbls_tgt=builder.get_target("tarballs"); + Target *tarbls_tgt = builder.get_target("tarballs"); tarbls_tgt->add_depend(result); return; } else if(type==INSTALL) { - inst_loc=name; + inst_loc = name; for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { FileTarget *ft; - if(Target *tgt=builder.get_target(i->str())) - ft=dynamic_cast(tgt); + if(Target *tgt = builder.get_target(i->str())) + ft = dynamic_cast(tgt); else - ft=new File(builder, pkg, *i); + ft = new File(builder, pkg, *i); inst_list.push_back(ft); } } else if(type==DATAFILE) { File *source; - if(Target *tgt=builder.get_target(files.front().str())) - source=dynamic_cast(tgt); + if(Target *tgt = builder.get_target(files.front().str())) + source = dynamic_cast(tgt); else - source=new File(builder, pkg, files.front()); - ::DataFile *result=new ::DataFile(builder, *this, *source); - inst_list.push_back(result); + source = new File(builder, pkg, files.front()); + ::DataFile *result = new ::DataFile(builder, *this, *source); + + if(&pkg==builder.get_main_package() && deflt) + def_tgt->add_depend(result); + else + world->add_depend(result); + if(install) + inst_list.push_back(result); } else { for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - string ext=FS::extpart(FS::basename(*i)); + string ext = FS::extpart(FS::basename(*i)); if(ext==".h") { - FileTarget *hdr=dynamic_cast(builder.get_target(i->str())); + FileTarget *hdr = dynamic_cast(builder.get_target(i->str())); if(!hdr) - hdr=new Header(builder, *this, i->str()); + hdr = new Header(builder, *this, i->str()); // Install headers if requested if(type==HEADERS && install) @@ -170,11 +187,11 @@ void Component::create_targets() const list objs; for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - string ext=FS::extpart(FS::basename(*i)); + string ext = FS::extpart(FS::basename(*i)); if((ext==".cpp" || ext==".cc" || ext==".c")) { - SourceFile *src=new SourceFile(builder, *this, i->str()); - ObjectFile *obj=new ObjectFile(builder, *this, *src); + SourceFile *src = new SourceFile(builder, *this, i->str()); + ObjectFile *obj = new ObjectFile(builder, *this, *src); objs.push_back(obj); } } @@ -199,24 +216,33 @@ void Component::create_targets() const } } - Target *inst_tgt=builder.get_target("install"); + Target *inst_tgt = builder.get_target("install"); for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) - inst_tgt->add_depend(new Install(builder, pkg, **i, inst_loc)); + { + Install *inst = new Install(builder, pkg, **i, inst_loc); + inst_tgt->add_depend(inst); + + if(type==LIBRARY) + if(SharedLibrary *shlib = dynamic_cast(*i)) + if(!shlib->get_soname().empty()) + 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; @@ -241,44 +267,34 @@ void Component::Loader::finish() if(!inst_hdr.empty()) { Component hdrcomp(comp.pkg, HEADERS, inst_hdr); - hdrcomp.sources=comp.sources; - hdrcomp.install=true; + hdrcomp.sources = comp.sources; + hdrcomp.install = true; const_cast(comp.pkg.get_components()).push_back(hdrcomp); } } 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) { - Package *req=comp.pkg.get_builder().get_package(n); + Package *req = comp.pkg.get_builder().get_package(n); if(req) comp.requires.push_back(req); } 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) @@ -286,11 +302,11 @@ void Component::Loader::install_headers(const string &p) IO::print("%s: Note: install_headers is deprecated\n", get_source()); if(comp.type==HEADERS) { - comp.name=p; - comp.install=true; + comp.name = p; + comp.install = true; } else - inst_hdr=p; + inst_hdr = p; } void Component::Loader::build_info()