X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=5255b864dd8aac6b44eff025dd736fdbdacd5de2;hb=6613371a07a1a9a8d5dead488092015261a9bf5f;hp=d4022f5f3fae7b0f045ddea2087828d5eb987ad9;hpb=63adab21a6f229f434b41eb59c5718fdc3c37b15;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index d4022f5..5255b86 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -9,19 +9,151 @@ using namespace Msp; #include +/** +Creates a buildable package. +*/ Package::Package(Builder &b, const string &n, const Path::Path &s): builder(b), name(n), - source(s), buildable(true), - build_info_ready(false) + source(s), + conf_done(false), + use_pkgconfig(true), + need_path(false) { } +/** +Sets the path where the package files were installed. This is only useful for +non-buildable packages that don't use pkg-config. +*/ +void Package::set_path(const Msp::Path::Path &p) +{ + path=builder.get_cwd()/p; +} + +/** +Checks which kinds of things the components of this package install. + +@return A bitmask of installed things +*/ +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; +} + +/** +Tries to resolve all references to dependency packages. +*/ +void Package::resolve_refs() +{ + for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + { + Package *pkg=i->resolve(); + if(pkg) all_reqs.push_back(pkg); + } + for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) + { + i->resolve_refs(); + const PkgRefList &creqs=i->get_requires(); + for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j) + if(j->get_package()) + all_reqs.push_back(j->get_package()); + } +} + +/** +Processes configuration options that were most likely obtained from the command +line. +*/ +void Package::configure(const RawOptionMap &opts, unsigned flag) +{ + if(conf_done || !buildable) + return; + + if(builder.get_verbose()>=3) + cout<<"Configuring "<=2) + cout<<"Configuration of "<configure(opts, flag&2); + if((*i)->get_need_path()) + (*i)->set_path(config.get_option((*i)->get_name()+"_path").value); + } + + create_build_info(); + + conf_done=true; +} + +/** +Creates a non-buildable package with the given name. Pkg-config is tried first +to get build information. If it fails, a built-in list of known packages is +consulted. +*/ +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; + bool use_pkgconfig=true; + if(info.empty()) + { + use_pkgconfig=false; + + //XXX Put these in an external file + 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; + pkg->use_pkgconfig=use_pkgconfig; + return pkg; +} + +/*** private ***/ + Package::Package(Builder &b, const string &n, const vector &info): builder(b), name(n), - buildable(false), - build_info_ready(false) + buildable(false) { for(vector::const_iterator i=info.begin(); i!=info.end(); ++i) { @@ -36,35 +168,53 @@ Package::Package(Builder &b, const string &n, const vector &info): } } -void Package::set_path(const Msp::Path::Path &p) +/** +Initializes configuration options and loads cached values. +*/ +void Package::init_config() { - path=builder.get_cwd()/p; -} + 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"); + config.add_option("staticlibs", "local", "Use static libraries"); -void Package::resolve_refs() -{ - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - i->resolve_refs(); + 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) + if(i->get_package() && i->get_package()->get_need_path()) + config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name()); + + config.load(source/".options.cache"); } +/** +Fills in build info based on configuration. All required packages must be +configured when this is called. +*/ void Package::create_build_info() { - if(build_info_ready) - return; - if(buildable) { - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) + 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()); + //XXX We probably really only want to pass cflags and defines through export_binfo.add(pkg->get_exported_binfo()); } @@ -116,92 +266,6 @@ void Package::create_build_info() } } 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; -} - -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(list::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): @@ -216,11 +280,6 @@ Package::Loader::Loader(Package &p): add("build_info", &Loader::build_info); } -Package::Loader::~Loader() -{ - pkg.init_buildable(); -} - void Package::Loader::require(const string &n) { pkg.requires.push_back(PackageRef(pkg.builder, n));