X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=ea53d23ea94693fb35e79a290bd5a9364215b018;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=6272321b56b702b3b730c9ccca53618efab08078;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 6272321..ea53d23 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,21 +1,22 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include -#include +#include +#include +#include +#include +#include #include #include "builder.h" #include "component.h" +#include "datafile.h" +#include "executable.h" +#include "file.h" #include "header.h" #include "install.h" #include "objectfile.h" #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" +#include "symlink.h" +#include "tarball.h" #include "target.h" using namespace std; @@ -26,150 +27,222 @@ Component::Component(SourcePackage &p, Type t, const string &n): type(t), name(n), install(false), - module_host(0), - modular(false), deflt(true) { } -/** -Tries to resolve all references to packages. -*/ -void Component::resolve_refs() +void Component::configure(const StringMap &opts, unsigned flag) { - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); + 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); } -/** -Prepares the build information for building. -*/ void Component::create_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()); + } + + 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(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) + *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(); + + if(pkg.get_library_mode()!=DYNAMIC) { - if(!i->get_package()) - continue; - //i->get_package()->create_build_info(); - build_info.add(i->get_package()->get_exported_binfo()); + 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()); + } } 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(); } -/** -Creates all targets needed for building this component. -*/ void Component::create_targets() const { - Builder &builder=pkg.get_builder(); - Target *world=builder.get_target("world"); - Target *def_tgt=builder.get_target("default"); - - PathList files=collect_source_files(); + Builder &builder = pkg.get_builder(); + Target *world = builder.get_target("world"); + Target *def_tgt = builder.get_target("default"); - bool build_exe=(type!=HEADERS); + PathList files = collect_source_files(); + list inst_list; - list objs; - list inst_tgts; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + string inst_loc; + if(type==TARBALL) { - string basename=(*i)[-1]; - string ext=Path::splitext(basename).ext; - if((ext==".cpp" || ext==".c") && build_exe) - { - SourceFile *src=new SourceFile(builder, this, i->str()); + string tarname = name; + if(name=="@src") + tarname = pkg.get_name()+"-"+pkg.get_version(); + TarBall *result = new TarBall(builder, pkg, tarname); - // Compile sources - ObjectFile *obj=new ObjectFile(builder, *this, *src); - objs.push_back(obj); + if(name=="@src") + { + 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); + files.push_back(pkg.get_source()/"Build"); } - else if(ext==".h") + + for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - Target *hdr=builder.get_target(i->str()); - if(!hdr) - hdr=new Header(builder, this, i->str()); + FileTarget *ft; + if(Target *tgt = builder.get_target(i->str())) + ft = dynamic_cast(tgt); + else + ft = new File(builder, *i); + result->add_depend(ft); + } + + Target *tarbls_tgt = builder.get_target("tarballs"); + tarbls_tgt->add_depend(result); - // Install headers if requested - if(!install_headers.empty()) - inst_tgts.push_back(hdr); + return; + } + else if(type==INSTALL) + { + 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); + else + 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); + else + source = new File(builder, pkg, files.front()); + ::DataFile *result = new ::DataFile(builder, *this, *source); - if(build_exe) + 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 { - Executable *exe=0; - StaticLibrary *slib=0; - if(type==LIBRARY) + for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - exe=new SharedLibrary(builder, *this, objs); - slib=new StaticLibrary(builder, *this, objs); + string ext = FS::extpart(FS::basename(*i)); + if(ext==".h") + { + FileTarget *hdr = dynamic_cast(builder.get_target(i->str())); + if(!hdr) + hdr = new Header(builder, *this, i->str()); + + // Install headers if requested + if(type==HEADERS && install) + inst_list.push_back(hdr); + } } - else - exe=new Executable(builder, *this, objs); + } - if(&pkg==builder.get_default_package() && deflt) + if(type==PROGRAM || type==LIBRARY || type==MODULE) + { + list objs; + for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - def_tgt->add_depend(exe); - if(slib) def_tgt->add_depend(slib); + 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); + objs.push_back(obj); + } } - else + + list results; + if(type==LIBRARY) { - world->add_depend(exe); - if(slib) world->add_depend(slib); + results.push_back(new SharedLibrary(builder, *this, objs)); + results.push_back(new StaticLibrary(builder, *this, objs)); } + else + results.push_back(new Executable(builder, *this, objs)); - if(install) + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { - inst_tgts.push_back(exe); - if(slib) - inst_tgts.push_back(slib); + if(&pkg==builder.get_main_package() && deflt) + def_tgt->add_depend(*i); + else + world->add_depend(*i); + if(install) + inst_list.push_back(*i); } } - Target *inst_tgt=builder.get_target("install"); - for(TargetList::const_iterator i=inst_tgts.begin(); i!=inst_tgts.end(); ++i) - inst_tgt->add_depend(new Install(builder, pkg, **i)); + Target *inst_tgt = builder.get_target("install"); + for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) + { + 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())); + } } -/** -Collects all files belonging to the component. -*/ 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) { - struct stat st; - stat(*i, st); - if(S_ISDIR(st.st_mode)) + 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; @@ -181,7 +254,7 @@ Component::Loader::Loader(Component &c): { add("source", &Loader::source); add("install", &Component::install); - add("install_headers", &Component::install_headers); + add("install_headers", &Loader::install_headers); add("build_info", &Loader::build_info); add("require", &Loader::require); add("modular", &Loader::modular); @@ -189,36 +262,51 @@ Component::Loader::Loader(Component &c): add("default", &Component::deflt); } +void Component::Loader::finish() +{ + if(!inst_hdr.empty()) + { + Component hdrcomp(comp.pkg, HEADERS, inst_hdr); + 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) { - comp.requires.push_back(PackageRef(comp.pkg.get_builder(), 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 Msp::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->get_modular()) - throw Msp::Exception("Module host must be a modular program"); - comp.module_host=&*i; - return; - } + IO::print("%s: Note: host is deprecated\n", get_source()); +} - throw Msp::Exception("Unknown component"); +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; + } + else + inst_hdr = p; } void Component::Loader::build_info()