Save caches before starting the build

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 3ad6146349fbaf331fa2779e97407e4ff2aa6f6a..e26c1157ec88ff5b06a3f08710d41a16cfcbf442 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -13,12 +13,14 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
+#include "gnutools.h"
 #include "installedfile.h"
+#include "microsofttools.h"
 #include "package.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemtools.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -85,9 +87,15 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 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));
-       toolchain.add_toolchain(new SystemTools(*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));
 }
@@ -161,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();
@@ -248,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;
 }