X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=40b098ca10931b4bf31651f80b7dcbb64beded83;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=f51f4abbc5b48a12ad57dcb689ade1861c694999;hpb=62853c9bb228cbb541304e866036cd931e3f5500;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index f51f4ab..40b098c 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include #include #include @@ -19,6 +19,7 @@ #include "sourcepackage.h" #include "tool.h" #include "vcxprojectfile.h" +#include "vssolutionfile.h" using namespace std; using namespace Msp; @@ -41,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 @@ -72,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); } @@ -105,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(value)) continue; @@ -118,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()) @@ -151,7 +152,10 @@ void SourcePackage::do_prepare() export_binfo.standards = build_info.standards; if(arch.get_system()=="windows") + { new VcxProjectFile(builder, *this); + new VsSolutionFile(builder, *this); + } new CompileCommandsJson(builder, *this); } @@ -163,23 +167,11 @@ void SourcePackage::save_caches() } -SourcePackage::Loader::Loader(SourcePackage &p): - DataFile::DerivedObjectLoader(p), - FeatureConditional(p, p.name) -{ - init(0); -} - -SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): +SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o): DataFile::DerivedObjectLoader(p), - FeatureConditional(p, p.name) + FeatureConditional(p, p.name), + options(o) { - init(&o); -} - -void SourcePackage::Loader::init(const Config::InputOptions *o) -{ - options = o; add("android_application", &Loader::component); add("build_info", &Loader::build_info); add("datapack", &Loader::component); @@ -188,9 +180,9 @@ void SourcePackage::Loader::init(const Config::InputOptions *o) add("generate", &Loader::generate); add("install", &Loader::component); add("interface_version", &Loader::interface_version); - add("library", &Loader::component_arg); - add("module", &Loader::component_arg); - add("program", &Loader::component_arg); + add("library", &Loader::component_arg, BinaryComponent::LIBRARY); + add("module", &Loader::component_arg, BinaryComponent::MODULE); + add("program", &Loader::component_arg, BinaryComponent::PROGRAM); add("source_archive", &Loader::source_archive); add("source_tarball", &Loader::source_archive); add("tarball", &Loader::tarball); @@ -201,9 +193,12 @@ 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); + { + obj.components.erase(i); + obj.components.push_back(obj.source_archive); + } } void SourcePackage::Loader::feature(const string &n, const string &d) @@ -216,7 +211,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); } @@ -230,8 +225,8 @@ void SourcePackage::Loader::component(const string &n) obj.components.push_back(comp); } -template -void SourcePackage::Loader::component_arg(const string &n) +template +void SourcePackage::Loader::component_arg(A a, const string &n) { C *comp = new C(obj, n, a); load_sub(*comp);