X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=6eeaa2fa3ca3b39e05298b3bd780ff5401cccbaa;hb=878f5e0572a561c1fc342228970889a192d06256;hp=9fdb8ee6a56e6b9fb5dfa709cd8d6e90cfdd596e;hpb=25376a637c584fc9d491bb6a40c4c483341418b0;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 9fdb8ee..6eeaa2f 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,570 +1,167 @@ #include -#include -#include +#include #include #include -#include #include #include #include #include #include -#include -#include -#include +#include #include -#include "analyzer.h" +#include "androidtools.h" #include "binarypackage.h" #include "builder.h" -#include "copy.h" -#include "gnuarchiver.h" -#include "gnuccompiler.h" -#include "gnucxxcompiler.h" -#include "gnulinker.h" +#include "builtintools.h" +#include "datatool.h" #include "installedfile.h" -#include "misc.h" #include "package.h" -#include "pkgconfig.h" -#include "pkgconfiggenerator.h" #include "sharedlibrary.h" #include "sourcepackage.h" -#include "tar.h" +#include "systemtools.h" #include "task.h" #include "virtualtarget.h" using namespace std; using namespace Msp; -Builder::Builder(int argc, char **argv): - main_pkg(0), +Builder::Builder(): + package_manager(*this), native_arch(*this, string()), + current_arch(0), + build_type(0), vfs(*this), - analyzer(0), - build(false), - clean(0), - dry_run(false), - help(false), - verbose(1), - show_progress(false), - build_file("Build"), - jobs(1), - conf_all(false), - conf_only(false), - build_all(false), - create_makefile(false) + build_graph(*this), + logger(&default_logger), + tempdir("temp"), + top_loader(0) { - string analyze_mode; - string work_dir; - bool full_paths = false; - unsigned max_depth = 5; - StringList cmdline_warn; - string prfx; - string arch; - - GetOpt getopt; - getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform analysis. MODE can be deps, alldeps or rebuild.", "MODE"); - getopt.add_option('b', "build", build, GetOpt::NO_ARG).set_help("Perform build even if doing analysis."); - getopt.add_option('c', "clean", clean, GetOpt::NO_ARG).set_help("Clean buildable targets."); - getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE"); - getopt.add_option('h', "help", help, GetOpt::NO_ARG).set_help("Print this message."); - getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM"); - getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done."); - getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG).set_help("Print more information about what's going on."); - getopt.add_option('x', "no-externals", no_externals, GetOpt::NO_ARG).set_help("Do not load external source packages."); - getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG).set_help("Apply configuration to all packages."); - getopt.add_option('B', "build-all", build_all, GetOpt::NO_ARG).set_help("Build all targets unconditionally."); - getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR"); - getopt.add_option('P', "progress", show_progress, GetOpt::NO_ARG).set_help("Display progress while building."); - getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE"); - getopt.add_option( "arch", arch, GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH"); - getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG).set_help("Stop after configuring packages."); - getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG).set_help("Output full paths in analysis."); - getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM"); - getopt.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR"); - getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST"); - usagemsg = getopt.generate_usage(argv[0])+" [ ...]"; - helpmsg = getopt.generate_help(); - getopt(argc, argv); - - if(!analyze_mode.empty()) - { - 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(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); - else - 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/".."); + set_architecture(string()); } Builder::~Builder() { - 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; + if(current_arch!=&native_arch) + delete current_arch; } -int Builder::main() +void Builder::set_architecture(const string &name) { - 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) + if(name.empty()) { - 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->needs_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"); - } + current_arch = &native_arch; + prefix = FS::get_home_dir()/"local"; } - - if(analyzer) - analyzer->analyze(); - - if(!problems.empty()) + else { - 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; + current_arch = new Architecture(*this, name); + prefix = FS::get_home_dir()/"local"/current_arch->get_name(); } - - 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) +void Builder::set_build_type(const string &name) { - list argv; - argv.push_back("pkg-config"); - 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; + build_type = &get_item(build_types, name); } -Package *Builder::get_package(const string &name) +void Builder::set_prefix(const FS::Path &p) { - 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(name); - if(i!=packages.end()) - return i->second; - } - } - - 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; + prefix = p; } -Target *Builder::get_target(const string &n) const +void Builder::set_temp_directory(const FS::Path &p) { - TargetMap::const_iterator i = targets.find(n); - if(i!=targets.end()) - return i->second; - return 0; + tempdir = p; } -void Builder::apply_profile_template(Config &config, const string &pt) const +void Builder::add_default_tools() { - vector parts = split(pt, '-'); - - 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); - } + if(current_arch->get_system()=="android") + toolchain.add_toolchain(new AndroidTools(*this, *current_arch)); + toolchain.add_toolchain(new SystemTools(*this, *current_arch)); + toolchain.add_toolchain(new BuiltinTools(*this)); + toolchain.add_tool(new DataTool(*this)); } -void Builder::problem(const string &p, const string &d) +void Builder::set_logger(const Logger *l) { - problems.push_back(Problem(p, d)); + logger = (l ? l : &default_logger); } -void Builder::add_target(Target *t) +list Builder::collect_problems() const { - targets.insert(TargetMap::value_type(t->get_name(), t)); - new_tgts.push_back(t); -} + list problems; + set broken_packages; + set broken_components; + set broken_tools; + + const BuildGraph::TargetMap &targets = build_graph.get_targets(); + for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) + if(i->second->is_broken()) + { + const list &tgt_problems = i->second->get_problems(); + for(list::const_iterator j=tgt_problems.begin(); j!=tgt_problems.end(); ++j) + problems.push_back(format("%s: %s", i->second->get_name(), *j)); -void Builder::usage(const char *reason, const char *argv0, bool brief) -{ - if(reason) - IO::print(IO::cerr, "%s\n", reason); + const Package *package = i->second->get_package(); + if(package && !package->get_problems().empty()) + broken_packages.insert(package); - if(brief) - IO::print(IO::cerr, "Usage: %s\n", usagemsg); - else - { - 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); - } -} + const Component *component = i->second->get_component(); + if(component && !component->get_problems().empty()) + broken_components.insert(component); -FS::Path Builder::get_package_location(const string &name) -{ - if(verbose>=3) - IO::print("Looking for package %s\n", name); + const Tool *tool = i->second->get_tool(); + if(tool && !tool->get_problems().empty()) + broken_tools.insert(tool); + } - try + // TODO Sort components after their packages, and targets last + for(set::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i) { - // Try to get source directory with pkgconfig - string srcdir = strip(run_pkgconfig(name, "source")); - if(!srcdir.empty()) - return srcdir; + const list &pkg_problems = (*i)->get_problems(); + for(list::const_iterator j=pkg_problems.begin(); j!=pkg_problems.end(); ++j) + problems.push_back(format("%s: %s", (*i)->get_name(), *j)); } - catch(...) - { } - if(pkg_dirs.empty()) + for(set::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i) { - 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()); + const list &comp_problems = (*i)->get_problems(); + for(list::const_iterator j=comp_problems.begin(); j!=comp_problems.end(); ++j) + problems.push_back(format("%s/%s: %s", (*i)->get_package().get_name(), (*i)->get_name(), *j)); } - bool msp = !name.compare(0, 3, "msp"); - for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) + for(set::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i) { - string base = basename(*i); - unsigned dash = base.rfind('-'); - - if(!base.compare(0, dash, name)) - return *i; - else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) - return *i; + const list &tool_problems = (*i)->get_problems(); + for(list::const_iterator j=tool_problems.begin(); j!=tool_problems.end(); ++j) + problems.push_back(format("%s: %s", (*i)->get_tag(), *j)); } - return FS::Path(); + return problems; } -int Builder::load_build_file(const FS::Path &fn) +void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all) { - if(!FS::exists(fn)) - return -1; - IO::BufferedFile in(fn.str()); - if(verbose>=3) - IO::print("Reading %s\n", fn); + get_logger().log("files", format("Reading %s", fn)); DataFile::Parser parser(in, fn.str()); - Loader loader(*this, fn.subpath(0, fn.size()-1)); + Loader loader(*this, opts, all); loader.load(parser); - - return 0; -} - -int Builder::create_targets() -{ - Target *world = new VirtualTarget(*this, "world"); - - Target *def_tgt = new VirtualTarget(*this, "default"); - world->add_depend(def_tgt); - - 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 || !i->second->is_configured()) - continue; - - SourcePackage *spkg = dynamic_cast(i->second); - if(!spkg) - continue; - - const ComponentList &components = spkg->get_components(); - for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) - j->create_targets(); - - if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) - { - PkgConfig *pc = new PkgConfig(*this, *spkg); - install->add_depend(new InstalledFile(*this, *spkg, *pc)); - } - } - - // Apply what-ifs - // XXX This does not currently work with targets found during dependency discovery - 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); - if(!tgt) - tgt = vfs.get_target(*i); - if(!tgt) - tgt = vfs.get_target(cwd/ *i); - if(!tgt) - { - IO::print("I don't know anything about %s\n", *i); - return -1; - } - - cmdline->add_depend(tgt); - } - - 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; } -int Builder::do_build() +int Builder::build(unsigned jobs, bool dry_run, bool show_progress) { - Target *cmdline = get_target("cmdline"); - - unsigned total = 0; - for(map::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->is_buildable() && i->second->needs_rebuild()) - ++total; + unsigned total = build_graph.count_rebuild_targets(); if(!total) { - IO::print("Already up to date\n"); + get_logger().log("summary", "Already up to date"); return 0; } - if(verbose>=1) - IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : "")); + get_logger().log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : ""))); vector tasks; @@ -572,32 +169,52 @@ int Builder::do_build() bool fail = false; bool finish = false; + bool starved = false; while(!finish) { - if(tasks.size()get_buildable_target(); + Target *tgt = build_graph.get_buildable_target(); if(tgt) { if(tgt->get_tool()) - IO::print("%-4s %s\n", tgt->get_tool()->get_tag(), tgt->get_name()); + get_logger().log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name())); Task *task = tgt->build(); if(task) - tasks.push_back(task); + { + get_logger().log("commands", format("%s", task->get_command())); + if(dry_run) + { + task->signal_finished.emit(true); + delete task; + } + else + { + task->start(); + 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 + starved = true; } else Time::sleep(10*Time::msec); for(unsigned i=0; icheck(); + Task::Status status; + if(jobs==1 || (tasks.size()==1 && starved)) + status = tasks[i]->wait(); + else + status = tasks[i]->check(); + if(status!=Task::RUNNING) { ++count; @@ -608,6 +225,7 @@ int Builder::do_build() fail = true; if(tasks.empty() && fail) finish = true; + starved = false; } else ++i; @@ -617,119 +235,105 @@ int Builder::do_build() if(show_progress) IO::print("\033[K"); if(fail) - IO::print("Build failed\n"); + get_logger().log("summary", "Build failed"); else if(show_progress) - IO::print("Build complete\n"); + get_logger().log("summary", "Build complete"); + + if(!dry_run) + { + const PackageManager::PackageMap &packages = package_manager.get_packages(); + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + i->second->save_caches(); + } return fail; } -int Builder::do_clean() +int Builder::clean(bool all, bool dry_run) { // Cleaning doesn't care about ordering, so a simpler method can be used set clean_tgts; list queue; - queue.push_back(get_target("cmdline")); + queue.push_back(&build_graph.get_goals()); while(!queue.empty()) { Target *tgt = queue.front(); - queue.erase(queue.begin()); + queue.pop_front(); - if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2)) + if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all)) clean_tgts.insert(tgt); - const Target::Dependencies &deps = tgt->get_depends(); + const Target::Dependencies &deps = tgt->get_dependencies(); 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)) - if(ft->get_mtime()) - FS::unlink(ft->get_path()); - - return 0; -} - -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"); + get_logger().log("tasks", format("RM %s", (*i)->get_name())); + if(!dry_run) + (*i)->clean(); } -} -string Builder::usagemsg; -string Builder::helpmsg; + return 0; +} -Builder::Loader::Loader(Builder &b, const FS::Path &s): - bld(b), - src(s) +Builder::Loader::Loader(Builder &b, const Config::InputOptions *o, bool a): + DataFile::ObjectLoader(b), + options(o), + conf_all(a) { + add("architecture", &Loader::architecture); add("binary_package", &Loader::binpkg); - add("cross_prefix", &Loader::cross_prefix); - add("profile", &Loader::profile); + add("build_type", &Loader::build_type); 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)); + if(!obj.top_loader) + obj.top_loader = this; + else if(!options && obj.top_loader!=this && obj.top_loader->conf_all) + options = obj.top_loader->options; } -void Builder::Loader::cross_prefix(const string &a, const string &p) +Builder::Loader::~Loader() { - bld.cross_prefixes[a] = p; + if(obj.top_loader==this) + obj.top_loader = 0; } -void Builder::Loader::profile(const string &n) +void Builder::Loader::architecture(const string &n) { - StringMap prf; - ProfileLoader ldr(prf); - load_sub_with(ldr); - bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); + if(obj.current_arch->match_name(n)) + load_sub(*obj.current_arch); } -void Builder::Loader::package(const string &n) +void Builder::Loader::binpkg(const string &n) { - SourcePackage *pkg = new SourcePackage(bld, n, src); - if(!bld.main_pkg) - bld.main_pkg = pkg; - + BinaryPackage *pkg = new BinaryPackage(obj, n); load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); } - -Builder::ProfileLoader::ProfileLoader(StringMap &p): - profile(p) +void Builder::Loader::build_type(const string &n) { - add("option", &ProfileLoader::option); + BuildType btype(n); + load_sub(btype); + BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first; + if(!obj.build_type) + obj.build_type = &i->second; } -void Builder::ProfileLoader::option(const string &o, const string &v) +void Builder::Loader::package(const string &n) { - profile.insert(StringMap::value_type(o, v)); + SourcePackage *pkg = new SourcePackage(obj, n, get_source()); + + if(options) + load_sub(*pkg, *options); + else + load_sub(*pkg); + + if(obj.build_type) + pkg->set_build_type(*obj.build_type); }