X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=c905ee464e7041de6372cbcca0f7e7142e20ef35;hb=1968c546cfb30214e8dc5afc722bec14aa8373f5;hp=fcbe9f7a6208fe8c10f3bac150f78d5c6986138c;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index fcbe9f7..c905ee4 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,4 +1,12 @@ -#include +/* $Id$ + +This file is part of builder +Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Distributed under the LGPL +*/ + +#include +#include #include "builder.h" #include "misc.h" #include "package.h" @@ -6,184 +14,74 @@ using namespace std; using namespace Msp; -PackageRef::PackageRef(Builder &b, const string &n): - builder(b), - name(n), - package(0) -{ } - -Package *PackageRef::resolve() -{ - if(!package) - package=builder.get_package(name); - return package; -} +#include -Package::Package(Builder &b, const string &n, const Path::Path &s): +/** +Creates a buildable package. +*/ +Package::Package(Builder &b, const string &n): builder(b), name(n), - source(s), - buildable(true), - build_info_ready(false) + conf_done(false), + use_pkgconfig(true) { } -Package::Package(Builder &b, const string &n, const vector &info): - builder(b), - name(n), - buildable(false), - build_info_ready(true) +/** +Collects all directly and indirectly required packages, including the package +itself. +*/ +PackageList Package::collect_requires() { - for(vector::const_iterator i=info.begin(); i!=info.end(); ++i) + PackageList result; + result.push_back(this); + for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) { - if(!i->compare(0, 2, "-I")) - export_binfo.incpath.push_back(i->substr(2)); - else if(!i->compare(0, 2, "-D")) - export_binfo.defines.push_back(i->substr(2)); - else if(!i->compare(0, 2, "-L")) - export_binfo.libpath.push_back(i->substr(2)); - else if(!i->compare(0, 2, "-l")) - export_binfo.libs.push_back(i->substr(2)); + PackageList r=(*i)->collect_requires(); + result.splice(result.end(), r); } -} -void Package::resolve_refs() -{ - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); + result.sort(); + result.unique(); + + return result; } -void Package::create_build_info() +/** +Processes configuration options that were most likely obtained from the command +line. +*/ +void Package::configure(const StringMap &opts, unsigned flag) { - if(build_info_ready) + if(conf_done) return; - - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) - { - if(!i->get_package()) - continue; - i->get_package()->create_build_info(); - build_info.add(i->get_package()->get_exported_binfo()); - } - - build_info.cflags.push_back("-Wall"); - build_info.cflags.push_back("-Wshadow"); - build_info.cflags.push_back("-Wextra"); - build_info.cflags.push_back("-Wpointer-arith"); - build_info.cflags.push_back("-Wconversion"); - build_info.cflags.push_back("-Werror"); - unsigned flags=get_install_flags(); + if(builder.get_verbose()>=3) + cout<<"Configuring "<::iterator i=components.begin(); i!=components.end(); ++i) - { - i->create_build_info(); - if(i->get_type()==Component::LIBRARY) - export_binfo.libs.push_back(i->get_name()); - } + for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->configure(opts, flag&2); - build_info_ready=true; -} + create_build_info(); -void Package::process_options(const RawOptionMap &opts) -{ - config.process(opts); + conf_done=true; } -Package *Package::create(Builder &b, const string &name) -{ - list argv; - argv.push_back("pkg-config"); - argv.push_back("--cflags"); - argv.push_back("--libs"); - argv.push_back(name); - vector info=split(run_command(argv)); - - if(info.empty()) - return 0; - - Package *pkg=new Package(b, name, info); - return pkg; -} - -void Package::init_buildable() -{ - buildable=true; - - config.add_option("tempdir", "temp", "Directory for storing temporary files"); - config.add_option("optimize", "0", "Apply compiler optimizations"); - config.add_option("debug", "0", "Produce debugging symbols"); - - const char *home=getenv("HOME"); - unsigned flags=get_install_flags(); - if(flags) - config.add_option("prefix", string(home)+"/local"/*"/usr"*/, "Installation prefix"); - /*if(flags&INCLUDE) - config.add_option("includedir", "$prefix/include", "Header installation directory"); - if(flags&BIN) - config.add_option("includedir", "$prefix/bin", "Binary installation directory"); - if(flags&LIB) - config.add_option("includedir", "$prefix/lib", "Library installation directory"); - if(flags&DATA) - config.add_option("includedir", "$prefix/share", "Data installation directory");*/ -} - -unsigned Package::get_install_flags() -{ - unsigned flags=0; - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - { - if(i->get_install()) - { - if(i->get_type()==Component::PROGRAM) - flags|=BIN; - else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE) - flags|=LIB; - } - if(!i->get_install_headers().empty()) - flags|=INCLUDE; - } - - return flags; -} +/*** private ***/ Package::Loader::Loader(Package &p): pkg(p) { - add("version", &Package::version); - add("description", &Package::description); - add("require", &Loader::require); - add("program", &Loader::program); - add("library", &Loader::library); -} - -Package::Loader::~Loader() -{ - pkg.init_buildable(); + add("require", &Loader::require); } void Package::Loader::require(const string &n) { - pkg.requires.push_back(PackageRef(pkg.builder, n)); -} - -void Package::Loader::program(const std::string &n) -{ - Component prog(pkg, Component::PROGRAM, n); - load_sub(prog); - pkg.components.push_back(prog); -} - -void Package::Loader::library(const std::string &n) -{ - Component prog(pkg, Component::LIBRARY, n); - load_sub(prog); - pkg.components.push_back(prog); + Package *req=pkg.builder.get_package(n); + if(req) + pkg.requires.push_back(req); }