Use auto type for iterator variables

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 0a69d7aa22f058641980b03768b8ccce030babb0..4d680ba9bd234e5d16e62ea76adda82bf8a89c2e 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <cstdlib>
+#include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
@@ -9,6 +9,7 @@
 #include "binarycomponent.h"
 #include "binarypackage.h"
 #include "builder.h"
+#include "compilecommandsjson.h"
 #include "datapackcomponent.h"
 #include "file.h"
 #include "installcomponent.h"
@@ -17,6 +18,8 @@
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
 #include "tool.h"
+#include "vcxprojectfile.h"
+#include "vssolutionfile.h"
 
 using namespace std;
 using namespace Msp;
@@ -39,8 +42,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 
 SourcePackage::~SourcePackage()
 {
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-               delete *i;
+       for(Component *c: components)
+               delete c;
 }
 
 FS::Path SourcePackage::get_temp_directory() const
@@ -70,9 +73,9 @@ FS::Path SourcePackage::get_output_directory() const
 
 const Component &SourcePackage::get_component(const string &n) const
 {
-       for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
-               if((*i)->get_name()==n)
-                       return **i;
+       auto i = find_if(components, [&n](const Component *c){ return c->get_name()==n; });
+       if(i!=components.end())
+               return **i;
        throw key_error(n);
 }
 
@@ -103,12 +106,12 @@ void SourcePackage::do_prepare()
        build_info.incpath.push_back((builder.get_prefix()/"include").str());
        build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-       for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
+       for(const Feature &f: features)
        {
-               string ident = "WITH_"+toupper(i->name);
-               string value = config.get_option("with_"+i->name).value;
+               string ident = "WITH_"+toupper(f.name);
+               string value = config.get_option("with_"+f.name).value;
 
-               if(i->choices.empty())
+               if(f.choices.empty())
                {
                        if(!lexical_cast<bool>(value))
                                continue;
@@ -116,22 +119,22 @@ void SourcePackage::do_prepare()
                }
 
                build_info.defines[ident] = value;
-               if(i->exported)
+               if(f.exported)
                        export_binfo.defines[ident] = value;
        }
 
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+       for(Component *c: components)
        {
-               (*i)->prepare();
-               (*i)->create_build_info();
+               c->prepare();
+               c->create_build_info();
 
-               (*i)->update_exported_build_info(export_binfo);
+               c->update_exported_build_info(export_binfo);
        }
 
        cache.load();
 
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-               (*i)->create_targets();
+       for(Component *c: components)
+               c->create_targets();
 
        const Architecture &arch = builder.get_native_arch();
        if(!export_binfo.libs.empty())
@@ -145,6 +148,16 @@ void SourcePackage::do_prepare()
                        builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
                }
        }
+
+       export_binfo.standards = build_info.standards;
+
+       if(arch.get_system()=="windows")
+       {
+               new VcxProjectFile(builder, *this);
+               new VsSolutionFile(builder, *this);
+       }
+
+       new CompileCommandsJson(builder, *this);
 }
 
 void SourcePackage::save_caches()
@@ -192,7 +205,7 @@ void SourcePackage::Loader::finish()
 {
        /* Make sure the source tarball is last in the list so targets from all
        other components wil be created first */
-       ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_archive);
+       auto i = find(obj.components, obj.source_archive);
        if(i!=obj.components.end())
                obj.components.splice(obj.components.end(), obj.components, i);
 }
@@ -207,7 +220,7 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
        const Config::Option &opt = obj.config.add_option(feat);
        if(options)
        {
-               Config::InputOptions::const_iterator i = options->find(opt.name);
+               auto i = options->find(opt.name);
                if(i!=options->end())
                        obj.config.set_option(opt.name, i->second);
        }