X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=4d680ba9bd234e5d16e62ea76adda82bf8a89c2e;hb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;hp=1dd7dbd1062263b91f71bc7fd0cd007cd28e8f97;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 1dd7dbd..4d680ba 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -1,22 +1,25 @@ -#include #include +#include #include #include #include #include #include +#include "androidapplicationcomponent.h" #include "binarycomponent.h" #include "binarypackage.h" -#include "booleanevaluator.h" #include "builder.h" +#include "compilecommandsjson.h" #include "datapackcomponent.h" #include "file.h" #include "installcomponent.h" #include "pkgconfigfile.h" -#include "tarballcomponent.h" -#include "tool.h" +#include "sourcearchivecomponent.h" #include "sourcegenerator.h" #include "sourcepackage.h" +#include "tool.h" +#include "vcxprojectfile.h" +#include "vssolutionfile.h" using namespace std; using namespace Msp; @@ -33,14 +36,14 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f): build_file = builder.get_vfs().get_target(f); if(!build_file) build_file = new File(builder, *this, f); - source_tarball = new TarballComponent(*this, "@src"); - components.push_back(source_tarball); + source_archive = new SourceArchiveComponent(*this); + components.push_back(source_archive); } 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,37 +106,58 @@ 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; - if(!i->choices.empty()) - build_info.defines[ident] = value; - else if(lexical_cast(value)) - build_info.defines[ident] = "1"; + string ident = "WITH_"+toupper(f.name); + string value = config.get_option("with_"+f.name).value; + + if(f.choices.empty()) + { + if(!lexical_cast(value)) + continue; + value = "1"; + } + + build_info.defines[ident] = value; + 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()) { export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); - PkgConfigFile *pc = new PkgConfigFile(builder, *this); - builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc)); + if(arch.get_system()=="linux") + { + PkgConfigFile *pc = new PkgConfigFile(builder, *this); + 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() @@ -144,13 +168,15 @@ void SourcePackage::save_caches() SourcePackage::Loader::Loader(SourcePackage &p): - DataFile::DerivedObjectLoader(p) + DataFile::DerivedObjectLoader(p), + FeatureConditional(p, p.name) { init(0); } SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): - DataFile::DerivedObjectLoader(p) + DataFile::DerivedObjectLoader(p), + FeatureConditional(p, p.name) { init(&o); } @@ -158,18 +184,19 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): void SourcePackage::Loader::init(const Config::InputOptions *o) { options = o; - add("description", &SourcePackage::description); + add("android_application", &Loader::component); add("build_info", &Loader::build_info); + add("datapack", &Loader::component); + add("description", &SourcePackage::description); add("feature", &Loader::feature); add("generate", &Loader::generate); - add("if_feature", &Loader::if_feature); - add("program", &Loader::component_arg); - add("library", &Loader::component_arg); - add("module", &Loader::component_arg); add("install", &Loader::component); add("interface_version", &Loader::interface_version); - add("datapack", &Loader::component); - add("source_tarball", &Loader::source_tarball); + add("library", &Loader::component_arg); + add("module", &Loader::component_arg); + add("program", &Loader::component_arg); + add("source_archive", &Loader::source_archive); + add("source_tarball", &Loader::source_archive); add("tarball", &Loader::tarball); add("version", &Loader::version); } @@ -178,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_tarball); + auto i = find(obj.components, obj.source_archive); if(i!=obj.components.end()) obj.components.splice(obj.components.end(), obj.components, i); } @@ -193,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); } @@ -227,15 +254,6 @@ void SourcePackage::Loader::generate(const string &tag) obj.local_tools.add_tool(gen); } -void SourcePackage::Loader::if_feature(const string &cond) -{ - BooleanEvaluator eval(sigc::mem_fun(&obj, &SourcePackage::match_feature)); - bool match = eval.evaluate(cond); - obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not "))); - if(match) - load_sub_with(*this); -} - void SourcePackage::Loader::interface_version(const string &v) { obj.interface_version = v; @@ -243,15 +261,14 @@ void SourcePackage::Loader::interface_version(const string &v) obj.version = v; } -void SourcePackage::Loader::source_tarball() +void SourcePackage::Loader::source_archive() { - load_sub(*obj.source_tarball); + load_sub(*obj.source_archive); } -void SourcePackage::Loader::tarball(const string &n) +void SourcePackage::Loader::tarball(const string &) { - TarballComponent trbl(obj, n); - load_sub(trbl); + IO::print("%s: Deprecated tarball component ignored\n", get_source()); } void SourcePackage::Loader::version(const string &v)