X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=5f25f1a90eb053705092d75b13f565109ffbf2a4;hb=62106ed7cef9b8ef6f07aaf491f8250f7e8d9398;hp=3072fd6a65ccd1d6a6303d54b80ffdb789ca35da;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 3072fd6..5f25f1a 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,220 +1,58 @@ -#include -#include +#include +#include +#include +#include "booleanevaluator.h" #include "builder.h" -#include "misc.h" #include "package.h" using namespace std; using namespace Msp; -PackageRef::PackageRef(Builder &b, const string &n): +Package::Package(Builder &b, const string &n): builder(b), name(n), - package(0) -{ } - -Package *PackageRef::resolve() -{ - if(!package) - package=builder.get_package(name); - return package; -} - -Package::Package(Builder &b, const string &n, const Path::Path &s): - builder(b), - name(n), - source(s), - buildable(true), - build_info_ready(false) -{ } - -Package::Package(Builder &b, const string &n, const vector &info): - 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)); - } -} - -void Package::resolve_refs() + label(string(1, toupper(n[0]))+n.substr(1)), + prepared(false), + use_pkgconfig(true) { - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); + builder.get_package_manager().add_package(this); } -void Package::create_build_info() +void Package::prepare() { - if(build_info_ready) + if(prepared) 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.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) -{ - config.process(opts); -} - -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 - return 0; - } - - Package *pkg=new Package(b, name, info); - return pkg; -} + for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->prepare(); -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"); - config.add_option("cpu", "auto", "CPU type to optimize for"); - config.add_option("arch", "native", "Architecture for cross-compiling"); - - 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");*/ + do_prepare(); + prepared = 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; -} Package::Loader::Loader(Package &p): - pkg(p) + DataFile::ObjectLoader(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("if_arch", &Loader::if_arch); + add("label", &Package::label); + add("require", &Loader::require); } -Package::Loader::~Loader() +void Package::Loader::if_arch(const string &cond) { - pkg.init_buildable(); + BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.builder.get_current_arch(), &Architecture::match_name)), false); + bool match = eval.evaluate(cond); + obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not "))); + if(match) + load_sub_with(*this); } 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); + Package *req = obj.builder.get_package_manager().find_package(n); + if(req) + obj.requires.push_back(req); + else + obj.problems.push_back(format("Required package %s not found", n)); }