X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=e26c1157ec88ff5b06a3f08710d41a16cfcbf442;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=7ef1ea1dcfd6d498969647a4cc7fe6f71f669db1;hpb=d914c5f40ca1194e7fd6a2b30664ac4717e38786;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 7ef1ea1..e26c115 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" @@ -89,6 +90,8 @@ void Builder::add_default_tools() 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") @@ -166,6 +169,13 @@ void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *op loader.load(parser); } +void Builder::save_caches() +{ + const PackageManager::PackageMap &packages = package_manager.get_packages(); + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + i->second->save_caches(); +} + int Builder::build(unsigned jobs, bool dry_run, bool show_progress) { unsigned total = build_graph.count_rebuild_targets(); @@ -253,13 +263,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; }