X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=587ce80da4f3b172ca839cb53be9d6673c7c2fb5;hb=4f78d9f016482ce1ac7d726852e33e07c090df1b;hp=14ae5f7878ac99781a701eb9fee6ce82052df204;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 14ae5f7..587ce80 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -17,7 +17,8 @@ Package::Package(Builder &b, const string &n, const Path::Path &s): name(n), buildable(true), source(s), - build_info_ready(false) + conf_done(false), + need_path(false) { } /** @@ -35,93 +36,51 @@ Tries to resolve all references to dependency packages. void Package::resolve_refs() { for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); + { + 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()); + } } /** -Fills in build info based on configuration. +Processes configuration options that were most likely obtained from the command +line. */ -void Package::create_build_info() +void Package::configure(const RawOptionMap &opts, unsigned flag) { - if(build_info_ready) + if(conf_done || !buildable) 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()); - } + 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()); - } + if(flag && config.process(opts) && !builder.get_dry_run()) + { + if(builder.get_verbose()>=2) + cout<<"Configuration of "<configure(opts, flag&2); + if((*i)->get_need_path()) + (*i)->set_path(config.get_option((*i)->get_name()+"_path").value); } - export_binfo.unique(); - - build_info_ready=true; -} + + create_build_info(); -/** -Processes configuration options that were most likely obtained from the command -line. -*/ -void Package::process_options(const RawOptionMap &opts) -{ - if(config.process(opts)) - config.save(source/".options.cache"); + conf_done=true; } /** @@ -165,8 +124,7 @@ Package *Package::create(Builder &b, const string &name) 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) { @@ -182,17 +140,16 @@ Package::Package(Builder &b, const string &n, const vector &info): } /** -Initializes a buildable package. Mostly adds configuration options. +Initializes configuration options and loads cached values. */ -void Package::init_buildable() +void Package::init_config() { - 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"); + 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"); const char *home=getenv("HOME"); unsigned flags=get_install_flags(); @@ -208,11 +165,80 @@ void Package::init_buildable() 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()); + 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(buildable) + { + for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + { + Package *pkg=i->get_package(); + if(!pkg) + continue; + 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()); + } + + 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(); +} + /** Checks which kinds of things the components of this package install. @@ -249,11 +275,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));