X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=21592661624742d5085d48a73a1c4ccf76e79572;hb=8f99b70eb78bdb5537afc77aa283961a2e825506;hp=b49bc7577909471b81459be1ee13c76e0651d194;hpb=3a61505c629d51f52343e7dfaaa936143557c3bf;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index b49bc75..2159266 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -17,6 +17,7 @@ #include "datatool.h" #include "gnutools.h" #include "installedfile.h" +#include "microsofttools.h" #include "package.h" #include "sharedlibrary.h" #include "sourcepackage.h" @@ -64,8 +65,8 @@ vector Builder::get_build_types() const { vector keys; keys.reserve(build_types.size()); - for(BuildTypeMap::const_iterator i=build_types.begin(); i!=build_types.end(); ++i) - keys.push_back(i->first); + for(const auto &kvp: build_types) + keys.push_back(kvp.first); return keys; } @@ -86,12 +87,14 @@ void Builder::set_temp_directory(const FS::Path &p) void Builder::add_default_tools() { - const string &sys = current_arch->get_system(); - if(sys=="android") + const string &arch_tc = current_arch->get_toolchain(); + if(current_arch->get_system()=="android") toolchain.add_toolchain(new AndroidTools(*this, *current_arch)); - else if((sys=="darwin" || sys=="freebsd") && vfs.find_binary("clang")) + 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 + 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)); @@ -109,48 +112,37 @@ list Builder::collect_problems() const 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()) + for(const auto &kvp: build_graph.get_targets()) + if(kvp.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)); + for(const string &p: kvp.second->get_problems()) + problems.push_back(format("%s: %s", kvp.second->get_name(), p)); - const Package *package = i->second->get_package(); + const Package *package = kvp.second->get_package(); if(package && !package->get_problems().empty()) broken_packages.insert(package); - const Component *component = i->second->get_component(); + const Component *component = kvp.second->get_component(); if(component && !component->get_problems().empty()) broken_components.insert(component); - const Tool *tool = i->second->get_tool(); + 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(set::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i) - { - 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)); - } + for(const Package *p: broken_packages) + for(const string &b: p->get_problems()) + problems.push_back(format("%s: %s", p->get_name(), b)); - for(set::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i) - { - 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)); - } + 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(set::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++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)); - } + 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; } @@ -166,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(); @@ -253,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; } @@ -279,17 +270,16 @@ int Builder::clean(bool all, bool dry_run) 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; @@ -334,7 +324,7 @@ void Builder::Loader::build_type(const string &n) { BuildType btype(n); load_sub(btype); - BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first; + auto i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first; if(!obj.build_type) obj.build_type = &i->second; } @@ -343,10 +333,7 @@ void Builder::Loader::package(const string &n) { SourcePackage *pkg = new SourcePackage(obj, n, get_source()); - if(options) - load_sub(*pkg, *options); - else - load_sub(*pkg); + load_sub(*pkg, options); if(obj.build_type) pkg->set_build_type(*obj.build_type);