X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5e32de5275f12a2dc1eb1f66c3466d15b482e050;hb=ce86d90028b2e69799a82fda19f78161e1c09099;hp=e33867680fb420e927d7abe20f5b524fe737defd;hpb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index e338676..5e32de5 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,21 +1,28 @@ /* $Id$ This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2009 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 "tarball.h" #include "target.h" using namespace std; @@ -31,9 +38,6 @@ Component::Component(SourcePackage &p, Type t, const string &n): deflt(true) { } -/** -Prepares the build information for building. -*/ void Component::create_build_info() { build_info.add(pkg.get_build_info()); @@ -41,12 +45,32 @@ void Component::create_build_info() for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) 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(); + 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) + { + // 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) + { + 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; if(lexical_cast(strip)) build_info.ldflags.push_back("-s"); } + else if(type==LIBRARY) + { + build_info.cflags.push_back("-fPIC"); + } if(modular) { @@ -63,9 +87,6 @@ void Component::create_build_info() build_info.unique(); } -/** -Creates all targets needed for building this component. -*/ void Component::create_targets() const { Builder &builder=pkg.get_builder(); @@ -73,82 +94,132 @@ void Component::create_targets() const Target *def_tgt=builder.get_target("default"); 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 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); + } - // Install headers if requested - if(!install_headers.empty()) - inst_tgts.push_back(hdr); + Target *tarbls_tgt=builder.get_target("tarballs"); + tarbls_tgt->add_depend(result); + + 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)); + for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) + inst_tgt->add_depend(new Install(builder, pkg, **i, inst_loc)); } -/** -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) { - struct stat st; - stat(*i, st); - if(S_ISDIR(st.st_mode)) + if(FS::is_dir(*i)) { list sfiles=list_files(*i); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) @@ -167,7 +238,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); @@ -175,6 +246,17 @@ 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); @@ -190,7 +272,7 @@ void Component::Loader::require(const string &n) void Component::Loader::modular() { if(comp.type!=PROGRAM) - throw Msp::Exception("Only programs can be modular"); + throw Exception("Only programs can be modular"); comp.modular=true; } @@ -200,13 +282,25 @@ void Component::Loader::host(const string &n) 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"); + 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) +{ + 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()