X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=d4022f5f3fae7b0f045ddea2087828d5eb987ad9;hb=63adab21a6f229f434b41eb59c5718fdc3c37b15;hp=fcbe9f7a6208fe8c10f3bac150f78d5c6986138c;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index fcbe9f7..d4022f5 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -1,3 +1,4 @@ +#include #include #include "builder.h" #include "misc.h" @@ -6,18 +7,7 @@ using namespace std; using namespace Msp; -PackageRef::PackageRef(Builder &b, const string &n): - builder(b), - name(n), - package(0) -{ } - -Package *PackageRef::resolve() -{ - if(!package) - package=builder.get_package(name); - return package; -} +#include Package::Package(Builder &b, const string &n, const Path::Path &s): builder(b), @@ -31,7 +21,7 @@ Package::Package(Builder &b, const string &n, const vector &info): builder(b), name(n), buildable(false), - build_info_ready(true) + build_info_ready(false) { for(vector::const_iterator i=info.begin(); i!=info.end(); ++i) { @@ -46,10 +36,17 @@ Package::Package(Builder &b, const string &n, const vector &info): } } +void Package::set_path(const Msp::Path::Path &p) +{ + path=builder.get_cwd()/p; +} + 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(); } void Package::create_build_info() @@ -57,59 +54,105 @@ void Package::create_build_info() if(build_info_ready) return; - for(list::iterator i=requires.begin(); i!=requires.end(); ++i) + if(buildable) { - if(!i->get_package()) - continue; - i->get_package()->create_build_info(); - build_info.add(i->get_package()->get_exported_binfo()); - } + for(list::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(); + 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(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()); + 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(); + build_info.unique(); - for(list::iterator i=components.begin(); i!=components.end(); ++i) + 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") { - i->create_build_info(); - if(i->get_type()==Component::LIBRARY) - export_binfo.libs.push_back(i->get_name()); + 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) { - config.process(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()) - return 0; + { + 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; } @@ -117,9 +160,11 @@ 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("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(); @@ -133,6 +178,11 @@ void Package::init_buildable() 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() @@ -162,6 +212,8 @@ Package::Loader::Loader(Package &p): 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() @@ -174,16 +226,28 @@ void Package::Loader::require(const string &n) pkg.requires.push_back(PackageRef(pkg.builder, n)); } -void Package::Loader::program(const std::string &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 std::string &n) +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); +}