#include <set>
-#include <cstdlib>
-#include <msp/core/getopt.h>
+#include <msp/core/maputils.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
-#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/buffered.h>
#include <msp/io/file.h>
#include <msp/io/print.h>
#include <msp/strings/format.h>
-#include <msp/strings/regex.h>
-#include <msp/strings/utils.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
#include <msp/time/utils.h>
-#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 "package.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):
+Builder::Builder():
package_manager(*this),
- main_pkg(0),
native_arch(*this, string()),
+ current_arch(0),
+ build_type(0),
vfs(*this),
- analyzer(0),
- build(false),
- clean(0),
- dry_run(false),
- help(false),
- 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;
- bool no_externals = false;
- unsigned verbose = 1;
- bool silent = false;
- list<string> log_channels;
-
- 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('l', "log", log_channels, GetOpt::REQUIRED_ARG).set_help("Set log channels to be displayed.", "LIST");
- 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('s', "silent", silent, GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
- 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])+" [<target> ...]";
- helpmsg = getopt.generate_help();
- getopt(argc, argv);
-
- if(silent)
- --verbose;
- if(verbose>=1)
- {
- logger.enable_channel("summary");
- logger.enable_channel("tasks");
- }
- if(verbose>=2)
- {
- logger.enable_channel("packages");
- logger.enable_channel("commands");
- }
- if(verbose>=3)
- {
- logger.enable_channel("packagemgr");
- logger.enable_channel("configure");
- }
- if(verbose>=4)
- {
- logger.enable_channel("files");
- logger.enable_channel("auxcommands");
- }
- if(verbose>=5)
- {
- logger.enable_channel("tools");
- logger.enable_channel("vfs");
- }
- for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
- {
- vector<string> parts = split(*i, ',');
- for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
- logger.enable_channel(*j);
- }
-
- 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<string> &args = getopt.get_args();
- for(vector<string>::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();
-
- package_manager.set_no_externals(no_externals);
-
- 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;
- }
- }
-
- 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));
-
- 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<string> warns = split(*i, ',');
- warnings.insert(warnings.end(), warns.begin(), warns.end());
- }
+ set_architecture(string());
}
Builder::~Builder()
{
- 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")
+ if(name.empty())
{
- FS::Path pcdir = prefix/"lib"/"pkgconfig";
- if(const char *pcp = getenv("PKG_CONFIG_PATH"))
- {
- vector<string> path = split(pcp, ':');
- bool found = false;
- for(vector<string>::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;
-
- logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
- current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
- logger.log("environment", format("Prefix is %s", prefix));
-
- const PackageManager::PackageMap &packages = package_manager.get_packages();
- list<string> package_details;
- for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- {
- if(!i->second || !i->second->is_configured())
- continue;
-
- string line = i->second->get_name();
- if(dynamic_cast<SourcePackage *>(i->second))
- {
- line += '*';
-
- 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)
- {
- line += format(" (%d targets", count);
- if(to_be_built)
- line += format(", %d to be built", to_be_built);
- line += ')';
- }
- }
-
- package_details.push_back(line);
+ current_arch = &native_arch;
+ prefix = FS::get_home_dir()/"local";
}
-
- logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
- for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
- logger.log("packages", *i);
-
- 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;
}
-Target *Builder::get_target(const string &n) const
+void Builder::set_build_type(const string &name)
{
- TargetMap::const_iterator i = targets.find(n);
- if(i!=targets.end())
- return i->second;
- return 0;
+ build_type = &get_item(build_types, name);
}
-void Builder::apply_profile_template(Config &config, const string &pt) const
+void Builder::set_prefix(const FS::Path &p)
{
- vector<string> parts = split(pt, '-');
-
- for(vector<string>::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);
- }
+ prefix = p;
}
-void Builder::problem(const string &p, const string &d)
+void Builder::set_temp_directory(const FS::Path &p)
{
- problems.push_back(Problem(p, d));
+ tempdir = p;
}
-void Builder::add_target(Target *t)
+void Builder::add_default_tools()
{
- targets.insert(TargetMap::value_type(t->get_name(), t));
-}
-
-void Builder::usage(const char *reason, const char *argv0, bool brief)
-{
- if(reason)
- IO::print(IO::cerr, "%s\n", reason);
-
- 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] [<target> ...]\n\n", argv0);
- IO::print(IO::cerr, "Options:\n");
- IO::print(IO::cerr, helpmsg);
- }
+ 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));
}
-int Builder::load_build_file(const FS::Path &fn)
+void Builder::set_logger(const Logger *l)
{
- if(!FS::exists(fn))
- return -1;
-
- IO::BufferedFile in(fn.str());
-
- logger.log("files", format("Reading %s", fn));
-
- DataFile::Parser parser(in, fn.str());
- Loader loader(*this, fn.subpath(0, fn.size()-1));
- loader.load(parser);
-
- return 0;
+ logger = (l ? l : &default_logger);
}
-int Builder::create_targets()
+list<string> Builder::collect_problems() const
{
- 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);
+ list<string> problems;
+ set<const Package *> broken_packages;
+ set<const Component *> broken_components;
+ set<const Tool *> 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<string> &tgt_problems = i->second->get_problems();
+ for(list<string>::const_iterator j=tgt_problems.begin(); j!=tgt_problems.end(); ++j)
+ problems.push_back(format("%s: %s", i->second->get_name(), *j));
- Target *tarballs = new VirtualTarget(*this, "tarballs");
- world->add_depend(tarballs);
+ const Package *package = i->second->get_package();
+ if(package && !package->get_problems().empty())
+ broken_packages.insert(package);
- const PackageManager::PackageMap &packages = package_manager.get_packages();
- for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- if(i->second && i->second->is_configured())
- i->second->create_targets();
+ const Component *component = i->second->get_component();
+ if(component && !component->get_problems().empty())
+ broken_components.insert(component);
- // Make the cmdline target depend on all targets mentioned on the command line
- Target *cmdline = new VirtualTarget(*this, "cmdline");
- for(list<string>::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;
+ const Tool *tool = i->second->get_tool();
+ if(tool && !tool->get_problems().empty())
+ broken_tools.insert(tool);
}
- cmdline->add_depend(tgt);
+ // TODO Sort components after their packages, and targets last
+ for(set<const Package *>::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i)
+ {
+ const list<string> &pkg_problems = (*i)->get_problems();
+ for(list<string>::const_iterator j=pkg_problems.begin(); j!=pkg_problems.end(); ++j)
+ problems.push_back(format("%s: %s", (*i)->get_name(), *j));
}
- cmdline->prepare();
-
- // Apply what-ifs
- for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+ for(set<const Component *>::const_iterator i=broken_components.begin(); i!=broken_components.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();
+ const list<string> &comp_problems = (*i)->get_problems();
+ for(list<string>::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));
}
- if(build_all)
+ for(set<const Tool *>::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i)
{
- for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->is_buildable() && !i->second->needs_rebuild())
- i->second->force_rebuild();
+ const list<string> &tool_problems = (*i)->get_problems();
+ for(list<string>::const_iterator j=tool_problems.begin(); j!=tool_problems.end(); ++j)
+ problems.push_back(format("%s: %s", (*i)->get_tag(), *j));
}
- for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- if(SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second))
- spkg->get_deps_cache().save();
-
- return 0;
+ return problems;
}
-int Builder::do_build()
+void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all)
{
- Target *cmdline = get_target("cmdline");
+ IO::BufferedFile in(fn.str());
+
+ get_logger().log("files", format("Reading %s", fn));
+
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, opts, all);
+ loader.load(parser);
+}
- unsigned total = 0;
- for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->is_buildable() && i->second->needs_rebuild())
- ++total;
+int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
+{
+ unsigned total = build_graph.count_rebuild_targets();
if(!total)
{
- logger.log("summary", "Already up to date");
+ get_logger().log("summary", "Already up to date");
return 0;
}
- logger.log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
+ get_logger().log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
vector<Task *> tasks;
bool fail = false;
bool finish = false;
+ bool starved = false;
while(!finish)
{
- if(tasks.size()<jobs && !fail)
+ if(tasks.size()<jobs && !fail && !starved)
{
- Target *tgt = cmdline->get_buildable_target();
+ Target *tgt = build_graph.get_buildable_target();
if(tgt)
{
if(tgt->get_tool())
- logger.log("tasks", format("%-4s %s", 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)
{
- logger.log("commands", format("%s", task->get_command()));
+ get_logger().log("commands", format("%s", task->get_command()));
if(dry_run)
{
task->signal_finished.emit(true);
}
else if(tasks.empty())
finish = true;
+ else
+ starved = true;
}
else
Time::sleep(10*Time::msec);
for(unsigned i=0; i<tasks.size();)
{
- Task::Status status = tasks[i]->check();
+ Task::Status status;
+ if(jobs==1 || (tasks.size()==1 && starved))
+ status = tasks[i]->wait();
+ else
+ status = tasks[i]->check();
+
if(status!=Task::RUNNING)
{
++count;
fail = true;
if(tasks.empty() && fail)
finish = true;
+ starved = false;
}
else
++i;
if(show_progress)
IO::print("\033[K");
if(fail)
- logger.log("summary", "Build failed");
+ get_logger().log("summary", "Build failed");
else if(show_progress)
- logger.log("summary", "Build complete");
+ 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<Target *> clean_tgts;
list<Target *> 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<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
if(!clean_tgts.count(*i))
queue.push_back(*i);
}
for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
- if(FileTarget *ft = dynamic_cast<FileTarget *>(*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<Builder>(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);
+ 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);
}
-
-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);
}
projects / builder.git / blobdiff