X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=cf4234607e978d1f6399a2732adaded39496602d;hb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;hp=338b44f43c0e83c10ebd62133533d7bf2b642db0;hpb=96e132661ec82c9347f9155d3f30cd99ea8eca47;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 338b44f..cf42346 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,25 +1,29 @@ /* $Id$ This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ -#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; @@ -43,27 +47,31 @@ void Component::create_build_info() build_info.add((*i)->get_exported_binfo()); 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(); + PackageList reqs = pkg.collect_requires(); for(PackageList::iterator i=reqs.begin(); i!=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"); } + else if(type==LIBRARY) + { + build_info.cflags.push_back("-fPIC"); + } if(modular) { @@ -72,7 +80,7 @@ void Component::create_build_info() } else if(module_host) { - const PathList &host_src=module_host->get_sources(); + 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()); } @@ -82,73 +90,136 @@ 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; - bool build_exe=(type!=HEADERS); - - list objs; - list inst_tgts; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + string inst_loc; + if(type==TARBALL) { - string ext=FS::extpart(FS::basename(*i)); - 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); - } - else if(ext==".h") + if(name=="@src") { - FileTarget *hdr=dynamic_cast(builder.get_target(i->str())); - if(!hdr) - hdr=new Header(builder, this, i->str()); + 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"); + } - // Install headers if requested - if(type==HEADERS && install) - inst_tgts.push_back(hdr); + 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, *i); + result->add_depend(ft); } - } - if(build_exe) + Target *tarbls_tgt = builder.get_target("tarballs"); + tarbls_tgt->add_depend(result); + + return; + } + else if(type==INSTALL) { - Binary *bin=0; - StaticLibrary *slib=0; - if(type==LIBRARY) + inst_loc = name; + for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - bin=new SharedLibrary(builder, *this, objs); - slib=new StaticLibrary(builder, *this, objs); + 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 - bin=new Executable(builder, *this, objs); + 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) { - def_tgt->add_depend(bin); - if(slib) def_tgt->add_depend(slib); + 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 + } + + if(type==PROGRAM || type==LIBRARY || type==MODULE) + { + list objs; + for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) { - world->add_depend(bin); - if(slib) world->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); + } } - if(install) + list results; + if(type==LIBRARY) { - inst_tgts.push_back(bin); - if(slib) - inst_tgts.push_back(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)); + + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) + { + 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(list::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)) + inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name())); + } } PathList Component::collect_source_files() const @@ -158,7 +229,7 @@ PathList Component::collect_source_files() const { if(FS::is_dir(*i)) { - list sfiles=list_files(*i); + list sfiles = list_files(*i); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) files.push_back(*i / *j); } @@ -188,8 +259,8 @@ 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); } } @@ -201,7 +272,7 @@ void Component::Loader::source(const string &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); } @@ -209,35 +280,35 @@ void Component::Loader::require(const string &n) void Component::Loader::modular() { if(comp.type!=PROGRAM) - throw Msp::Exception("Only programs can be modular"); - comp.modular=true; + throw Exception("Only programs can be modular"); + comp.modular = true; } void Component::Loader::host(const string &n) { - const ComponentList &comps=comp.pkg.get_components(); + 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; + if(i->get_type()!=PROGRAM || !i->is_modular()) + throw Exception("Module host must be a modular program"); + comp.module_host = &*i; return; } - throw Msp::Exception("Unknown component"); + throw KeyError("Unknown component", n); } void Component::Loader::install_headers(const string &p) { - cout<