X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=e16cd37aa592617a47de4e605d29462170d19896;hb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;hp=14d2321e26964229a04d68cc72716b791bc15978;hpb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 14d2321..e16cd37 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,255 +1,46 @@ -#include -#include +#include #include "builder.h" -#include "misc.h" #include "package.h" using namespace std; using namespace Msp; -#include - -Package::Package(Builder &b, const string &n, const Path::Path &s): +Package::Package(Builder &b, const string &n): builder(b), name(n), - buildable(true), - source(s), - build_info_ready(false) -{ } - -void Package::set_path(const Msp::Path::Path &p) -{ - path=builder.get_cwd()/p; -} - -void Package::resolve_refs() + label(string(1, toupper(n[0]))+n.substr(1)), + prepared(false), + use_pkgconfig(true) { - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - i->resolve_refs(); + builder.get_package_manager().add_package(this); } -void Package::create_build_info() +void Package::prepare() { - if(build_info_ready) + if(prepared) return; - - if(buildable) - { - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - { - Package *pkg=i->get_package(); - if(!pkg) - continue; - if(pkg->get_need_path()) - pkg->set_path(config.get_option(pkg->get_name()+"_path").value); - pkg->create_build_info(); - build_info.add(pkg->get_exported_binfo()); - export_binfo.add(pkg->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(); - - 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()); - } - } - else if(name=="fmod4") - { - export_binfo.libs.push_back("fmodex"); - if(!path.empty()) - { - export_binfo.libpath.push_back((path/"api"/"lib").str()); - export_binfo.incpath.push_back((path/"api"/"inc").str()); - } - } - export_binfo.unique(); - - 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)); - - bool need_path=false; - 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 if(name=="fmod4") - need_path=true; - else - return 0; - } - - Package *pkg=new Package(b, name, info); - pkg->need_path=need_path; - return pkg; -} -/*** private ***/ + for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->prepare(); -Package::Package(Builder &b, const string &n, const vector &info): - builder(b), - name(n), - buildable(false), - build_info_ready(false) -{ - 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)); - } + do_prepare(); + prepared = true; } -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");*/ - - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name()); - - config.load(source/".options.cache"); -} - -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) -{ - 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() + DataFile::ObjectLoader(p), + ArchitectureConditional(p.builder, p.name) { - pkg.init_buildable(); + add("label", &Package::label); + 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); + 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)); }