X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=2d5d97ccd49a4a8585c8ae573b549b0569eefb90;hpb=4c1d94fb9b70157f9c44b7feaf29ec585ae29276;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 2d5d97c..23a8d9c 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,5 +1,12 @@ -#include -#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" @@ -7,215 +14,58 @@ using namespace std; using namespace Msp; -Package::Package(Builder &b, const string &n, const Path::Path &s): - builder(b), - name(n), - source(s), - buildable(true), - build_info_ready(false) -{ } +#include -Package::Package(Builder &b, const string &n, const vector &info): +/** +Creates a buildable package. +*/ +Package::Package(Builder &b, const string &n): builder(b), name(n), - buildable(false), - build_info_ready(true) -{ - for(vector::const_iterator i=info.begin(); i!=info.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)); - } -} + conf_done(false), + use_pkgconfig(true) +{ } +/** +Tries to resolve all references to dependency packages. +*/ void Package::resolve_refs() { - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) + for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) i->resolve(); } -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(flags&INCLUDE) - export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str()); - if(flags&LIB) - export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str()); - string optimize=config.get_option("optimize").value; - if(strtol(optimize)) - { - build_info.cflags.push_back("-O"+optimize); - string cpu=config.get_option("cpu").value; - if(cpu!="auto") - build_info.cflags.push_back("-march="+cpu); - } - - if(strtobool(config.get_option("debug").value)) - { - build_info.cflags.push_back("-ggdb"); - build_info.defines.push_back("DEBUG"); - } - - build_info.unique(); - export_binfo.unique(); - - for(list::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()); - } - - build_info_ready=true; -} - -void Package::process_options(const RawOptionMap &opts) -{ - if(config.process(opts)) - config.save(source/".options.cache"); -} - -Package *Package::create(Builder &b, const string &name) -{ - list argv; - argv.push_back("pkg-config"); - argv.push_back("--silence-errors"); - argv.push_back("--cflags"); - argv.push_back("--libs"); - argv.push_back(name); - vector info=split(run_command(argv)); - - if(info.empty()) - { - if(name=="opengl") - info.push_back("-lGL"); - else if(name=="pthread") - info.push_back("-lpthread"); - else if(name=="gmpxx") - info.push_back("-lgmpxx"); - else - return 0; - } - - Package *pkg=new Package(b, name, info); - return pkg; -} + if(builder.get_verbose()>=3) + cout<<"Configuring "<get_package()->configure(opts, flag&2); - 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");*/ + create_build_info(); - config.load(source/".options.cache"); + conf_done=true; } -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); - add("headers", &Loader::headers); - add("build_info", &Loader::build_info); -} - -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 string &n) -{ - Component prog(pkg, Component::PROGRAM, n); - load_sub(prog); - pkg.components.push_back(prog); -} - -void Package::Loader::library(const string &n) -{ - Component prog(pkg, Component::LIBRARY, n); - load_sub(prog); - pkg.components.push_back(prog); -} - -void Package::Loader::headers(const string &n) -{ - Component prog(pkg, Component::HEADERS, n); - load_sub(prog); - pkg.components.push_back(prog); -} - -void Package::Loader::build_info() -{ - load_sub(pkg.build_info); -}