X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=6eeaa2fa3ca3b39e05298b3bd780ff5401cccbaa;hb=878f5e0572a561c1fc342228970889a192d06256;hp=92f639c9c594e184f617dce0b204677bb7225ea5;hpb=a5ea586a080ef6766a7d68b1c40633c6ae8b8ba4;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 92f639c..6eeaa2f 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,451 +1,167 @@ #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 "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), - tempdir("temp") + build_graph(*this), + logger(&default_logger), + tempdir("temp"), + top_loader(0) { - string analyze_mode; - string work_dir; - bool full_paths = false; - unsigned max_depth = 4; - StringList cmdline_warn; - string prfx; - string temp_str; - string arch; - bool no_externals = false; - unsigned verbose = 1; - bool silent = false; - list log_channels; - string build_type_name; - - GetOpt getopt; - getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform dependency analysis.", "MODE"); - getopt.add_option('b', "build", build, GetOpt::NO_ARG).set_help("Perform build even if also doing something else."); - 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 build instructions from FILE.", "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 up to NUM tasks in parallel.", "NUM"); - getopt.add_option('l', "log", log_channels, GetOpt::REQUIRED_ARG).set_help("Enable listed log channels.", "LIST"); - getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG).set_help("Show what would be done without actually doing it."); - getopt.add_option('s', "silent", silent, GetOpt::NO_ARG).set_help("Don't print any messages other than errors."); - getopt.add_option('t', "build-type", build_type_name, GetOpt::REQUIRED_ARG).set_help("Set build type.", "TYPE"); - 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("Build for architecture ARCH.", "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("Show up to NUM levels in analysis.", "NUM"); - getopt.add_option( "prefix", prfx, GetOpt::REQUIRED_ARG).set_help("Install things to DIR.", "DIR"); - getopt.add_option( "tempdir", temp_str, GetOpt::REQUIRED_ARG).set_help("Store temporary files in DIR.", "DIR"); - usagemsg = getopt.generate_usage(argv[0])+" [ ...]"; - 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("environment"); - logger.enable_channel("packages"); - logger.enable_channel("commands"); - } - if(verbose>=3) - { - logger.enable_channel("files"); - logger.enable_channel("auxcommands"); - } - for(list::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i) - { - vector parts = split(*i, ','); - for(vector::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 &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(); - - package_manager.append_package_path(cwd); - package_manager.append_package_path(cwd/".."); - package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder")); - - package_manager.set_no_externals(no_externals); - - if(arch.empty()) - current_arch = &native_arch; - else - current_arch = new Architecture(*this, arch); - - list start_files; - start_files.push_back(FS::get_sys_data_dir(argv[0], "builder")/"builderrc"); - start_files.push_back(FS::get_user_data_dir("builder")/"rc"); - for(list::const_iterator i=start_files.begin(); i!=start_files.end(); ++i) - if(FS::exists(*i)) - load_build_file(*i); - - 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 = cwd/prfx; - - if(!temp_str.empty()) - tempdir = temp_str; - - if(!build_type_name.empty()) - { - BuildTypeMap::iterator i = build_types.find(build_type_name); - if(i==build_types.end()) - throw usage_error("Unknown build type"); - build_type = &i->second; - } - - toolchain.add_tool(new GnuCCompiler(*this, *current_arch)); - toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch)); - toolchain.add_tool(new GnuLinker(*this, *current_arch)); - toolchain.add_tool(new GnuArchiver(*this, *current_arch)); - toolchain.add_tool(new Copy(*this)); - toolchain.add_tool(new Tar(*this)); - toolchain.add_tool(new PkgConfigGenerator(*this)); + 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) { - FS::Path main_file = cwd/build_file; - if(!FS::exists(main_file)) - { - if(help) - { - usage(0, "builder", false); - return 0; - } - else - { - IO::print(IO::cerr, "The file %s does not exist.\n", main_file); - return 1; - } - } - - load_build_file(main_file); - - if(help) + if(name.empty()) { - usage(0, "builder", false); - IO::print("\n"); - package_help(); - return 0; + current_arch = &native_arch; + prefix = FS::get_home_dir()/"local"; } - - if(!prepare_build()) - return 1; - - if(conf_only) - return 0; - - 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)); - if(tempdir.is_absolute()) - logger.log("environment", format("Temporary directory is %s", tempdir)); else - logger.log("environment", format("Using per-package temporary directory %s", tempdir)); - if(build_type) - logger.log("environment", format("Build type is %s", build_type->get_name())); - - const PackageManager::PackageMap &packages = package_manager.get_packages(); - list package_details; - for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { - if(!i->second || !i->second->is_prepared()) - continue; - - string line = i->second->get_name(); - if(dynamic_cast(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); - } - - logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size())); - for(list::const_iterator i=package_details.begin(); i!=package_details.end(); ++i) - logger.log("packages", *i); - - 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; + current_arch = new Architecture(*this, name); + prefix = FS::get_home_dir()/"local"/current_arch->get_name(); } - - if(clean) - exit_code = do_clean(); - 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::problem(const string &p, const string &d) +void Builder::set_prefix(const FS::Path &p) { - problems.push_back(Problem(p, d)); + prefix = p; } -void Builder::add_target(Target *t) +void Builder::set_temp_directory(const FS::Path &p) { - targets.insert(TargetMap::value_type(t->get_name(), t)); + tempdir = p; } -void Builder::add_primary_target(Target &t) +void Builder::add_default_tools() { - get_target("world")->add_dependency(t); - - if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default()) - get_target("default")->add_dependency(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] [ ...]\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)); } -void Builder::load_build_file(const FS::Path &fn) +void Builder::set_logger(const Logger *l) { - IO::BufferedFile in(fn.str()); - - logger.log("files", format("Reading %s", fn)); - - DataFile::Parser parser(in, fn.str()); - Loader loader(*this); - loader.load(parser); + logger = (l ? l : &default_logger); } -bool Builder::prepare_build() +list Builder::collect_problems() const { - Target *world = new VirtualTarget(*this, "world"); - - Target *def_tgt = new VirtualTarget(*this, "default"); - world->add_dependency(*def_tgt); - - Target *install = new VirtualTarget(*this, "install"); - world->add_dependency(*install); + 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)); - Target *tarballs = new VirtualTarget(*this, "tarballs"); - world->add_dependency(*tarballs); + const Package *package = i->second->get_package(); + if(package && !package->get_problems().empty()) + broken_packages.insert(package); - main_pkg->prepare(); + 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::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 false; + const Tool *tool = i->second->get_tool(); + if(tool && !tool->get_problems().empty()) + broken_tools.insert(tool); } - cmdline->add_dependency(*tgt); - } - - cmdline->prepare(); - - // Apply what-ifs - for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i) + // TODO Sort components after their packages, and targets last + for(set::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i) { - FileTarget *tgt = vfs.get_target(cwd/ *i); - if(!tgt) - { - IO::print(IO::cerr, "Unknown what-if target %s\n", *i); - return false; - } - tgt->touch(); + 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)); } - if(build_all) + for(set::const_iterator i=broken_components.begin(); i!=broken_components.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 &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)); } - if(!dry_run) + for(set::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i) { - const PackageManager::PackageMap &packages = package_manager.get_packages(); - for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) - i->second->save_caches(); + 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 true; + 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()); - unsigned total = 0; - for(map::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->is_buildable() && i->second->needs_rebuild()) - ++total; + get_logger().log("files", format("Reading %s", fn)); + + DataFile::Parser parser(in, fn.str()); + Loader loader(*this, opts, all); + loader.load(parser); +} + +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 tasks; @@ -459,15 +175,15 @@ int Builder::do_build() { if(tasks.size()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); @@ -519,9 +235,9 @@ int Builder::do_build() 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) { @@ -533,20 +249,20 @@ int Builder::do_build() 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_dependencies(); @@ -557,7 +273,7 @@ int Builder::do_clean() for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) { - logger.log("tasks", format("RM %s", (*i)->get_name())); + get_logger().log("tasks", format("RM %s", (*i)->get_name())); if(!dry_run) (*i)->clean(); } @@ -565,42 +281,27 @@ int Builder::do_clean() 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_required_packages(); - 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.description, opt.value); - if(opt.value!=opt.default_value) - IO::print(" [%s]", opt.default_value); - IO::print("\n"); - } -} - -string Builder::usagemsg; -string Builder::helpmsg; - - -Builder::Loader::Loader(Builder &b): - DataFile::ObjectLoader(b) +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("build_type", &Loader::build_type); - add("profile", &Loader::profile); add("package", &Loader::package); + + 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; +} + +Builder::Loader::~Loader() +{ + if(obj.top_loader==this) + obj.top_loader = 0; } void Builder::Loader::architecture(const string &n) @@ -624,19 +325,12 @@ void Builder::Loader::build_type(const string &n) obj.build_type = &i->second; } -void Builder::Loader::profile(const string &) -{ - IO::print("Profiles are deprecated\n"); -} - void Builder::Loader::package(const string &n) { SourcePackage *pkg = new SourcePackage(obj, n, get_source()); - if(!obj.main_pkg) - obj.main_pkg = pkg; - if(obj.conf_all || pkg==obj.main_pkg) - load_sub(*pkg, obj.cmdline_options); + if(options) + load_sub(*pkg, *options); else load_sub(*pkg);