X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=9c8e27be0aaa6cb3506d53ea22828c6dbc75f22d;hb=dcaf06c2bba4e02a312cd6af24ddc96410e7be4e;hp=c900837a2d6e978079294606ccbf4f182ae520e8;hpb=97001ddfa2463e6a3526eff772962acdad45f995;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index c900837..9c8e27b 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,176 +1,478 @@ -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "action.h" +#include +#include "analyzer.h" +#include "binarypackage.h" #include "builder.h" -#include "executable.h" +#include "copy.h" +#include "gnuarchiver.h" +#include "gnuccompiler.h" +#include "gnucxxcompiler.h" +#include "gnulinker.h" #include "header.h" +#include "installedfile.h" #include "misc.h" -#include "objectfile.h" #include "package.h" +#include "pkgconfig.h" +#include "pkgconfiggenerator.h" +#include "sharedlibrary.h" +#include "sourcepackage.h" +#include "systemlibrary.h" +#include "tar.h" +#include "task.h" #include "virtualtarget.h" using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + main_pkg(0), + native_arch(*this, string()), + vfs(*this), + analyzer(0), + build(false), + clean(0), + dry_run(false), + help(false), verbose(1), - cwd(Path::getcwd()) + show_progress(false), + build_file("Build"), + jobs(1), + conf_all(false), + conf_only(false), + build_all(false), + create_makefile(false) { - for(int i=1; i ...]"; + helpmsg = getopt.generate_help(); + getopt(argc, argv); + + if(!analyze_mode.empty()) { - string v(argv[i]); - unsigned equal=v.find('='); + analyzer = new Analyzer(*this); + + if(analyze_mode=="deps") + analyzer->set_mode(Analyzer::DEPS); + else if(analyze_mode=="alldeps") + analyzer->set_mode(Analyzer::ALLDEPS); + else if(analyze_mode=="rebuild") + analyzer->set_mode(Analyzer::REBUILD); + else if(analyze_mode=="rdeps") + analyzer->set_mode(Analyzer::RDEPS); + else + throw usage_error("Invalid analyze mode"); + + analyzer->set_max_depth(max_depth); + analyzer->set_full_paths(full_paths); + } + else if(!clean && !create_makefile) + build = true; + + const vector &args = getopt.get_args(); + for(vector::const_iterator i=args.begin(); i!=args.end(); ++i) + { + string::size_type equal = i->find('='); if(equal!=string::npos) - cmdline_options.insert(RawOptionMap::value_type(v.substr(0, equal), v.substr(equal+1))); + cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); else - cmdline_targets.push_back(argv[i]); + cmdline_targets.push_back(*i); } if(cmdline_targets.empty()) cmdline_targets.push_back("default"); + + if(!work_dir.empty()) + FS::chdir(work_dir); + + cwd = FS::getcwd(); + + toolchain.add_tool(new GnuCCompiler(*this)); + toolchain.add_tool(new GnuCxxCompiler(*this)); + toolchain.add_tool(new GnuLinker(*this)); + toolchain.add_tool(new GnuArchiver(*this)); + toolchain.add_tool(new Copy(*this)); + toolchain.add_tool(new Tar(*this)); + toolchain.add_tool(new PkgConfigGenerator(*this)); + + load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); + load_build_file((FS::get_user_data_dir("builder")/"rc").str()); + + if(arch.empty()) + current_arch = &native_arch; + else + current_arch = new Architecture(*this, arch); + + if(!current_arch->is_native()) + { + for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i) + if(current_arch->match_name(i->first)) + { + current_arch->set_cross_prefix(i->second); + break; + } + } + + if(prfx.empty()) + { + if(current_arch->is_native()) + prefix = (FS::get_home_dir()/"local").str(); + else + prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str(); + } + else + prefix = FS::getcwd()/prfx; + + warnings.push_back("all"); + warnings.push_back("extra"); + warnings.push_back("shadow"); + warnings.push_back("pointer-arith"); + warnings.push_back("error"); + for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i) + { + vector warns = split(*i, ','); + warnings.insert(warnings.end(), warns.begin(), warns.end()); + } + + pkg_path.push_back(cwd/"."); + pkg_path.push_back(cwd/".."); } -Package *Builder::get_package(const string &n) +Builder::~Builder() { - PackageMap::iterator i=packages.find(n); - if(i!=packages.end()) - return i->second; + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + delete i->second; + for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) + delete i->second; + delete analyzer; +} + +int Builder::main() +{ + if(prefix.str()!="/usr") + { + FS::Path pcdir = prefix/"lib"/"pkgconfig"; + if(const char *pcp = getenv("PKG_CONFIG_PATH")) + { + vector path = split(pcp, ':'); + bool found = false; + for(vector::const_iterator i=path.begin(); (!found && i!=path.end()); ++i) + found = (*i==pcdir.str()); + if(!found) + { + path.push_back(pcdir.str()); + setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true); + } + } + else + setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true); + } + + if(load_build_file(cwd/build_file)) + { + if(help) + { + usage(0, "builder", false); + return 0; + } + else + { + IO::print(IO::cerr, "No build info here.\n"); + return 1; + } + } + + main_pkg->configure(cmdline_options, conf_all?2:1); + + if(help) + { + usage(0, "builder", false); + IO::print("\n"); + package_help(); + return 0; + } + + if(conf_only) + return 0; + + if(create_targets()) + return 1; + + if(verbose>=2) + { + IO::print("Building on %s, for %s%s\n", native_arch.get_name(), + current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")); + IO::print("Prefix is %s\n", prefix); + } + + if(verbose>=1) + { + unsigned n_packages = 0; + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + if(i->second && i->second->is_configured()) + ++n_packages; + IO::print("%d active packages, %d targets\n", n_packages, targets.size()); + } + + if(verbose>=2) + { + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + { + if(!i->second->is_configured()) + continue; + + IO::print(" %s", i->second->get_name()); + if(dynamic_cast(i->second)) + IO::print("*"); + unsigned count = 0; + unsigned to_be_built = 0; + for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j) + if(j->second->get_package()==i->second) + { + ++count; + if(j->second->get_rebuild()) + ++to_be_built; + } + if(count) + { + IO::print(" (%d targets", count); + if(to_be_built) + IO::print(", %d to be built", to_be_built); + IO::print(")"); + } + IO::print("\n"); + } + } + + if(analyzer) + analyzer->analyze(); + + if(!problems.empty()) + { + IO::print(IO::cerr, "The following problems were detected:\n"); + for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i) + IO::print(IO::cerr, " %s: %s\n", i->package, i->descr); + if(!analyzer) + IO::print(IO::cerr, "Please fix them and try again.\n"); + return 1; + } + + if(clean) + exit_code = do_clean(); + else if(build) + exit_code = do_build(); + + return exit_code; +} +string Builder::run_pkgconfig(const string &pkg, const string &what) +{ list argv; argv.push_back("pkg-config"); - argv.push_back("--variable=source"); - argv.push_back(n); - string srcdir=strip(run_command(argv)); - - list dirs; - if(!srcdir.empty()) - dirs.push_back(srcdir); - - string dirname=n; - if(dirname.compare(0, 3, "msp")) - dirname.erase(0, 3); - dirs.push_back(cwd/dirname); - dirs.push_back(cwd/".."/dirname); - - for(list::iterator j=dirs.begin(); j!=dirs.end(); ++j) - if(!load_build_file(*j/"Build")) + if(what=="cflags" || what=="libs") + argv.push_back("--"+what); + else if(what=="flags") + { + argv.push_back("--cflags"); + argv.push_back("--libs"); + } + else + argv.push_back("--variable="+what); + argv.push_back(pkg); + + if(verbose>=4) + IO::print("Running %s\n", join(argv.begin(), argv.end())); + + int status; + string res = run_command(argv, &status); + if(status) + throw runtime_error(format("pkg-config for package %s failed", pkg)); + + return res; +} + +Package *Builder::get_package(const string &name) +{ + PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_system())); + if(i==packages.end()) + i = packages.find(name); + if(i!=packages.end()) + return i->second; + + if(!no_externals) + { + FS::Path path = get_package_location(name); + if(!path.empty() && !load_build_file(path/"Build")) { - i=packages.find(n); + i = packages.find(name); if(i!=packages.end()) return i->second; - return 0; } - - Package *pkg=Package::create(*this, n); - packages.insert(PackageMap::value_type(n, pkg)); - new_pkgs.push_back(pkg); + } + + Package *pkg = 0; + try + { + // Package source not found - create a binary package + pkg = BinaryPackage::from_pkgconfig(*this, name); + } + catch(...) + { + problem(name, "not found"); + } + + packages.insert(PackageMap::value_type(name, pkg)); return pkg; } -Target *Builder::get_target(const string &n) +Target *Builder::get_target(const string &n) const { - TargetMap::iterator i=targets.find(n); + TargetMap::const_iterator i = targets.find(n); if(i!=targets.end()) return i->second; return 0; } -Target *Builder::get_header(const string &include, const string &from, const list &path) +void Builder::apply_profile_template(Config &config, const string &pt) const { - string id=from+":"+include; - TargetMap::iterator i=includes.find(id); - if(i!=includes.end()) - return i->second; + vector parts = split(pt, '-'); - string fn=include.substr(1); - Target *tgt=0; - if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn))) - return tgt; - if((tgt=check_header(Path::Path("/usr/include")/fn))) - return tgt; - if((tgt=check_header(Path::Path("/usr/include/c++/4.1.2")/fn))) - return tgt; - for(list::const_iterator j=path.begin(); j!=path.end(); ++j) - if((tgt=check_header(Path::Path(*j)/fn))) - return tgt; - - return 0; + for(vector::iterator i=parts.begin(); i!=parts.end(); ++i) + { + ProfileTemplateMap::const_iterator j = profile_tmpl.find(*i); + if(j==profile_tmpl.end()) + continue; + + config.update(j->second); + } } -int Builder::main() +void Builder::problem(const string &p, const string &d) { - if(load_build_file("Build")) - { - cerr<<"No build info here.\n"; - return 1; - } + problems.push_back(Problem(p, d)); +} - default_pkg=packages.begin()->second; +void Builder::add_target(Target *t) +{ + targets.insert(TargetMap::value_type(t->get_name(), t)); + new_tgts.push_back(t); +} - while(!new_pkgs.empty()) - { - Package *pkg=new_pkgs.front(); - if(pkg==default_pkg) - pkg->process_options(cmdline_options); - new_pkgs.erase(new_pkgs.begin()); - pkg->resolve_refs(); - } +void Builder::usage(const char *reason, const char *argv0, bool brief) +{ + if(reason) + IO::print(IO::cerr, "%s\n", reason); - std::list missing; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(brief) + IO::print(IO::cerr, "Usage: %s\n", usagemsg); + else { - const list &requires=i->second->get_requires(); - for(list::const_iterator j=requires.begin(); j!=requires.end(); ++j) - if(!j->get_package()) - missing.push_back(j->get_name()); + IO::print(IO::cerr, "Builder 1.0\n\n"); + IO::print(IO::cerr, "Usage: %s [options] [ ...]\n\n", argv0); + IO::print(IO::cerr, "Options:\n"); + IO::print(IO::cerr, helpmsg); } +} - if(!missing.empty()) +FS::Path Builder::get_package_location(const string &name) +{ + if(verbose>=3) + IO::print("Looking for package %s\n", name); + + try { - missing.sort(); - missing.unique(); - cerr<<"The following packages were not found on the system:\n"; - for(list::iterator i=missing.begin(); i!=missing.end(); ++i) - cerr<<" "<<*i<<'\n'; - cerr<<"Please install them and try again.\n"; + // Try to get source directory with pkgconfig + string srcdir = strip(run_pkgconfig(name, "source")); + if(!srcdir.empty()) + return srcdir; } + catch(...) + { } - default_pkg->create_build_info(); - - cout<<"Active packages:"; - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(pkg_dirs.empty()) { - cout<<' '<second->get_name(); - if(i->second->get_buildable()) - cout<<'*'; + for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) + { + list files = list_files(*i); + for(list::const_iterator j=files.begin(); j!=files.end(); ++j) + { + FS::Path full = *i / *j; + if(FS::exists(full/"Build")) + pkg_dirs.push_back(full); + } + } + if(verbose>=3) + IO::print("%d packages found in path\n", pkg_dirs.size()); } - cout<<'\n'; - - if(create_targets()) - return 1; - /*for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) - cout<second->get_name()<<' '<second->get_type()<<' '<second->get_rebuild()<<' '<second->get_rebuild_reason()<<'\n';*/ - - cout<<"Active targets: "<::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) + { + string base = basename(*i); + unsigned dash = base.rfind('-'); - build(); + if(!base.compare(0, dash, name)) + return *i; + else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) + return *i; + } - return exit_code; + return FS::Path(); } -int Builder::load_build_file(const Path::Path &fn) +int Builder::load_build_file(const FS::Path &fn) { - ifstream in(fn.str().c_str()); - if(!in) + if(!FS::exists(fn)) return -1; - Parser::Parser parser(in, fn.str()); - Loader loader(*this, cwd/fn.subpath(0, fn.size()-1)); + IO::BufferedFile in(fn.str()); + + if(verbose>=3) + IO::print("Reading %s\n", fn); + + DataFile::Parser parser(in, fn.str()); + Loader loader(*this, fn.subpath(0, fn.size()-1)); loader.load(parser); return 0; @@ -178,156 +480,266 @@ int Builder::load_build_file(const Path::Path &fn) int Builder::create_targets() { - Target *world=new VirtualTarget(*this, "world"); - add_target(world); + Target *world = new VirtualTarget(*this, "world"); - Target *def_tgt=new VirtualTarget(*this, "default"); - add_target(def_tgt); + Target *def_tgt = new VirtualTarget(*this, "default"); world->add_depend(def_tgt); - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + Target *install = new VirtualTarget(*this, "install"); + world->add_depend(install); + + Target *tarballs = new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - if(!i->second->get_buildable()) + if(!i->second || !i->second->is_configured()) continue; - const ComponentList &components=i->second->get_components(); - for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) - { - Path::Path base=i->second->get_source()/j->get_source(); - list files=list_files(base); + SourcePackage *spkg = dynamic_cast(i->second); + if(!spkg) + continue; - list objs; - for(list::iterator k=files.begin(); k!=files.end(); ++k) - { - Path::Path fn=base/ *k; - string ext=Path::splitext(*k).ext; - if(ext==".cpp" || ext==".c") - { - SourceFile *src=new SourceFile(*this, &*j, fn.str()); - add_target(src); - - ObjectFile *obj=new ObjectFile(*this, *j, *src); - add_target(obj); - objs.push_back(obj); - } - else if(ext==".h") - add_target(new Header(*this, &*j, fn.str())); - } + const ComponentList &components = spkg->get_components(); + for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) + j->create_targets(); - Executable *exe=new Executable(*this, *j, objs); - add_target(exe); - if(i->second==default_pkg) - def_tgt->add_depend(exe); - else - world->add_depend(exe); + if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) + { + PkgConfig *pc = new PkgConfig(*this, *spkg); + install->add_depend(new InstalledFile(*this, *spkg, *pc)); } } + // Find dependencies until no new targets are created while(!new_tgts.empty()) { - Target *tgt=new_tgts.front(); + Target *tgt = new_tgts.front(); new_tgts.erase(new_tgts.begin()); tgt->find_depends(); + if(!tgt->get_depends_ready()) + new_tgts.push_back(tgt); } - Target *cmdline=new VirtualTarget(*this, "cmdline"); - add_target(cmdline); - world->add_depend(cmdline); + // Apply what-ifs + for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) + { + FileTarget *tgt = vfs.get_target(cwd/ *i); + if(!tgt) + { + IO::print(IO::cerr, "Unknown what-if target %s\n", *i); + return -1; + } + tgt->touch(); + } + + // Make the cmdline target depend on all targets mentioned on the command line + Target *cmdline = new VirtualTarget(*this, "cmdline"); for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { - Target *tgt=get_target(*i); + Target *tgt = get_target(*i); + if(!tgt) + tgt = vfs.get_target(*i); if(!tgt) - tgt=get_target((cwd/ *i).str()); + tgt = vfs.get_target(cwd/ *i); if(!tgt) { - cerr<<"I don't know anything about "<<*i<<'\n'; - return 1; + IO::print("I don't know anything about %s\n", *i); + return -1; } + cmdline->add_depend(tgt); } - world->prepare(); + cmdline->prepare(); + + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + if(SourcePackage *spkg = dynamic_cast(i->second)) + spkg->get_deps_cache().save(); return 0; } -Target *Builder::check_header(const Msp::Path::Path &fn) +int Builder::do_build() { - Target *tgt=get_target(fn.str()); - if(tgt) return tgt; + Target *cmdline = get_target("cmdline"); - if(Path::exists(fn)) + unsigned total = 0; + for(map::const_iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->is_buildable() && i->second->get_rebuild()) + ++total; + + if(!total) { - add_target(tgt=new SystemHeader(*this, fn.str())); - return tgt; + IO::print("Already up to date\n"); + return 0; } - return 0; -} + if(verbose>=1) + IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : "")); -void Builder::add_target(Target *t) -{ - targets.insert(TargetMap::value_type(t->get_name(), t)); - new_tgts.push_back(t); -} + vector tasks; -int Builder::build() -{ - Target *cmdline=get_target("cmdline"); - list actions; - bool fail=false; + unsigned count = 0; - if(!cmdline->get_rebuild()) - cout<<"Already up to date\n"; + bool fail = false; + bool finish = false; - while(cmdline->get_rebuild() && !fail) + while(!finish) { - if(actions.empty() && !fail) + if(tasks.size()get_buildable_target(); + Target *tgt = cmdline->get_buildable_target(); if(tgt) { - //cout<<"Build "<get_name()<<'\n'; - Action *action=tgt->build(); - if(action) - actions.push_back(action); + if(tgt->get_tool()) + IO::print("[%-10s] [%-4s] %s\n", tgt->get_package()->get_name(), tgt->get_tool()->get_tag(), tgt->get_name()); + Task *task = tgt->build(); + if(task) + tasks.push_back(task); + + if(show_progress) + IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : "")); } + else if(tasks.empty()) + finish = true; } else - sleep(10*Time::msec); + Time::sleep(10*Time::msec); - for(list::iterator i=actions.begin(); i!=actions.end();) + for(unsigned i=0; icheck(); - if(status>=0) + Task::Status status = tasks[i]->check(); + if(status!=Task::RUNNING) { - delete *i; - i=actions.erase(i); - if(status>0) - fail=true; + ++count; + + delete tasks[i]; + tasks.erase(tasks.begin()+i); + if(status==Task::ERROR) + fail = true; + if(tasks.empty() && fail) + finish = true; } else ++i; } } + if(show_progress) + IO::print("\033[K"); + if(fail) + IO::print("Build failed\n"); + else if(show_progress) + IO::print("Build complete\n"); + + return fail; +} + +int Builder::do_clean() +{ + // Cleaning doesn't care about ordering, so a simpler method can be used + + set clean_tgts; + list queue; + queue.push_back(get_target("cmdline")); + + while(!queue.empty()) + { + Target *tgt = queue.front(); + queue.erase(queue.begin()); + + if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2)) + clean_tgts.insert(tgt); + + const Target::Dependencies &deps = tgt->get_depends(); + for(list::const_iterator i=deps.begin(); i!=deps.end(); ++i) + if(!clean_tgts.count(*i)) + queue.push_back(*i); + } + + for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) + if(FileTarget *ft = dynamic_cast(*i)) + unlink(ft->get_path()); + return 0; } -Application::RegApp Builder::reg; +void Builder::package_help() +{ + const Config &config = main_pkg->get_config(); + const Config::OptionMap &options = config.get_options(); + + IO::print("Required packages:\n "); + const PackageList &requires = main_pkg->get_requires(); + for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) + { + if(i!=requires.begin()) + IO::print(", "); + IO::print((*i)->get_name()); + } + IO::print("\n\nPackage configuration:\n"); + for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) + { + const Config::Option &opt = i->second; + IO::print(" %s: %s (%s)", opt.name, opt.descr, opt.value); + if(opt.value!=opt.defv) + IO::print(" [%s]", opt.defv); + IO::print("\n"); + } +} + +string Builder::usagemsg; +string Builder::helpmsg; -Builder::Loader::Loader(Builder &b, const Path::Path &s): + +Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { + add("binary_package", &Loader::binpkg); + add("cross_prefix", &Loader::cross_prefix); + add("profile", &Loader::profile); add("package", &Loader::package); } +void Builder::Loader::binpkg(const string &n) +{ + BinaryPackage *pkg = new BinaryPackage(bld, n); + load_sub(*pkg); + bld.packages.insert(PackageMap::value_type(n, pkg)); +} + +void Builder::Loader::cross_prefix(const string &a, const string &p) +{ + bld.cross_prefixes[a] = p; +} + +void Builder::Loader::profile(const string &n) +{ + StringMap prf; + ProfileLoader ldr(prf); + load_sub_with(ldr); + bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); +} + void Builder::Loader::package(const string &n) { - Package *pkg=new Package(bld, n, src); + SourcePackage *pkg = new SourcePackage(bld, n, src); + if(!bld.main_pkg) + bld.main_pkg = pkg; + load_sub(*pkg); bld.packages.insert(PackageMap::value_type(n, pkg)); - bld.new_pkgs.push_back(pkg); - //cout<<"loaded "<get_name()<<'\n'; } + +Builder::ProfileLoader::ProfileLoader(StringMap &p): + profile(p) +{ + add("option", &ProfileLoader::option); +} + +void Builder::ProfileLoader::option(const string &o, const string &v) +{ + profile.insert(StringMap::value_type(o, v)); +}