Save caches before starting the build

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 94acd45f8099f907f5650f1d1e19428be38a0c07..e26c1157ec88ff5b06a3f08710d41a16cfcbf442 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -7,7 +7,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "androidtools.h"
 #include "binarypackage.h"
@@ -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"
@@ -60,6 +61,15 @@ void Builder::set_architecture(const string &name)
        }
 }
 
+vector<string> Builder::get_build_types() const
+{
+       vector<string> keys;
+       keys.reserve(build_types.size());
+       for(BuildTypeMap::const_iterator i=build_types.begin(); i!=build_types.end(); ++i)
+               keys.push_back(i->first);
+       return keys;
+}
+
 void Builder::set_build_type(const string &name)
 {
        build_type = &get_item(build_types, name);
@@ -77,11 +87,15 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       if(current_arch->get_system()=="darwin")
-               toolchain.add_toolchain(new ClangTools(*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));
-       toolchain.add_toolchain(new GnuTools(*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));
 }
@@ -155,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();
@@ -242,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;
 }
 
@@ -263,7 +277,7 @@ int Builder::clean(bool all, bool dry_run)
        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);