X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=5475c7dab99aaa6baf610ec6a6a3529d21b0b5bc;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=bbb95b6634cb03292ae1d37a017bd82094ce6eba;hpb=1dad660f7bbda5ef3239fd6374e0f8a77e19eaaa;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index bbb95b6..5475c7d 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -7,23 +7,20 @@ #include #include #include -#include +#include #include +#include "androidtools.h" #include "binarypackage.h" #include "builder.h" -#include "copy.h" +#include "builtintools.h" +#include "clangtools.h" #include "datatool.h" -#include "gnuarchiver.h" -#include "gnuccompiler.h" -#include "gnucxxcompiler.h" -#include "gnulinker.h" +#include "gnutools.h" #include "installedfile.h" -#include "mingwdlltool.h" +#include "microsofttools.h" #include "package.h" -#include "pkgconfiggenerator.h" #include "sharedlibrary.h" #include "sourcepackage.h" -#include "tar.h" #include "task.h" #include "virtualtarget.h" @@ -64,6 +61,15 @@ void Builder::set_architecture(const string &name) } } +vector Builder::get_build_types() const +{ + vector keys; + keys.reserve(build_types.size()); + for(const auto &kvp: build_types) + keys.push_back(kvp.first); + return keys; +} + void Builder::set_build_type(const string &name) { build_type = &get_item(build_types, name); @@ -81,15 +87,16 @@ void Builder::set_temp_directory(const FS::Path &p) void Builder::add_default_tools() { - 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)); - if(current_arch->get_system()=="windows") - toolchain.add_tool(new MingwDllTool(*this, *current_arch)); + const string &arch_tc = current_arch->get_toolchain(); + if(current_arch->get_system()=="android") + toolchain.add_toolchain(new AndroidTools(*this, *current_arch)); + else if(arch_tc=="msvc") + toolchain.add_toolchain(new MicrosoftTools(*this, *current_arch)); + else if(arch_tc=="clang") + toolchain.add_toolchain(new ClangTools(*this, *current_arch)); + else if(arch_tc=="gnu") + toolchain.add_toolchain(new GnuTools(*this, *current_arch)); + toolchain.add_toolchain(new BuiltinTools(*this)); toolchain.add_tool(new DataTool(*this)); } @@ -98,9 +105,46 @@ void Builder::set_logger(const Logger *l) logger = (l ? l : &default_logger); } -void Builder::problem(const string &p, const string &d) +list Builder::collect_problems() const { - problems.push_back(Problem(p, d)); + list problems; + set broken_packages; + set broken_components; + set broken_tools; + + for(const auto &kvp: build_graph.get_targets()) + if(kvp.second->is_broken()) + { + for(const string &p: kvp.second->get_problems()) + problems.push_back(format("%s: %s", kvp.second->get_name(), p)); + + const Package *package = kvp.second->get_package(); + if(package && !package->get_problems().empty()) + broken_packages.insert(package); + + const Component *component = kvp.second->get_component(); + if(component && !component->get_problems().empty()) + broken_components.insert(component); + + const Tool *tool = kvp.second->get_tool(); + if(tool && !tool->get_problems().empty()) + broken_tools.insert(tool); + } + + // TODO Sort components after their packages, and targets last + for(const Package *p: broken_packages) + for(const string &b: p->get_problems()) + problems.push_back(format("%s: %s", p->get_name(), b)); + + for(const Component *c: broken_components) + for(const string &b: c->get_problems()) + problems.push_back(format("%s/%s: %s", c->get_package().get_name(), c->get_name(), b)); + + for(const Tool *t: broken_tools) + for(const string &b: t->get_problems()) + problems.push_back(format("%s: %s", t->get_tag(), b)); + + return problems; } void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all) @@ -114,6 +158,12 @@ void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *op loader.load(parser); } +void Builder::save_caches() +{ + for(const auto &kvp: package_manager.get_packages()) + kvp.second->save_caches(); +} + int Builder::build(unsigned jobs, bool dry_run, bool show_progress) { unsigned total = build_graph.count_rebuild_targets(); @@ -201,13 +251,6 @@ int Builder::build(unsigned jobs, bool dry_run, bool show_progress) else if(show_progress) 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; } @@ -217,27 +260,26 @@ int Builder::clean(bool all, bool dry_run) set clean_tgts; list queue; - queue.push_back(build_graph.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()==&package_manager.get_main_package() || all)) clean_tgts.insert(tgt); - 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(Target *t: tgt->get_dependencies()) + if(!clean_tgts.count(t)) + queue.push_back(t); } - for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) + for(Target *t: clean_tgts) { - get_logger().log("tasks", format("RM %s", (*i)->get_name())); + get_logger().log("tasks", format("RM %s", t->get_name())); if(!dry_run) - (*i)->clean(); + t->clean(); } return 0; @@ -252,7 +294,6 @@ Builder::Loader::Loader(Builder &b, const Config::InputOptions *o, bool 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) @@ -288,11 +329,6 @@ 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());