X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=601627185a26e9e21f558567807d547fcc623733;hb=3043044d8ef02ef77def454fdede87927f5aa1f8;hp=dbb759205fe0eef45f3b0b1ded50cfe5ba80a077;hpb=64661ac00a3a7eaa2295b85be642b6c96276cf97;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index dbb7592..6016271 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -1,27 +1,29 @@ #include +#include +#include #include #include #include #include +#include "androidapplicationcomponent.h" +#include "binarycomponent.h" #include "binarypackage.h" #include "builder.h" +#include "compilecommandsjson.h" +#include "datapackcomponent.h" #include "file.h" +#include "installcomponent.h" #include "pkgconfigfile.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; -namespace { - -bool component_sort(const Component &c1, const Component &c2) -{ return c1.get_type()get_name()==n; }); + if(i!=components.end()) + return **i; + throw key_error(n); +} + +bool SourcePackage::match_feature(const string &feat, const string *comp) const +{ + string value = config.get_option("with_"+feat).value; + if(comp) + return value==*comp; else - { - bool negate = (cond[0]=='!'); - string feat = cond.substr(negate); - string value = config.get_option("with_"+feat).value; - return lexical_cast(value)!=negate; - } + return lexical_cast(value); } void SourcePackage::set_build_type(const BuildType &t) @@ -102,50 +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) - { - 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"; - } - - bool export_paths = false; - for(list::iterator i=components.begin(); i!=components.end(); ++i) + for(const Feature &f: features) { - i->prepare(); - i->create_build_info(); + string ident = "WITH_"+toupper(f.name); + string value = config.get_option("with_"+f.name).value; - if(i->get_type()==Component::LIBRARY) + if(f.choices.empty()) { - export_binfo.libs.push_back(i->get_name()); - export_paths = true; + if(!lexical_cast(value)) + continue; + value = "1"; } + + build_info.defines[ident] = value; + if(f.exported) + export_binfo.defines[ident] = value; } - if(export_paths) + for(Component *c: components) { - export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); - export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); + c->prepare(); + c->create_build_info(); + + c->update_exported_build_info(export_binfo); } cache.load(); - bool pc_needed = false; - for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) + for(Component *c: components) + c->create_targets(); + + const Architecture &arch = builder.get_native_arch(); + if(!export_binfo.libs.empty()) { - i->create_targets(); - if(i->get_type()==Component::LIBRARY) - pc_needed = true; + export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); + export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); + + 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)); + } } - if(pc_needed) + export_binfo.standards = build_info.standards; + + if(arch.get_system()=="windows") { - PkgConfigFile *pc = new PkgConfigFile(builder, *this); - builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc)); + new VcxProjectFile(builder, *this); + new VsSolutionFile(builder, *this); } + + new CompileCommandsJson(builder, *this); } void SourcePackage::save_caches() @@ -155,40 +167,35 @@ void SourcePackage::save_caches() } -SourcePackage::Loader::Loader(SourcePackage &p): - DataFile::DerivedObjectLoader(p) -{ - init(0); -} - -SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): - DataFile::DerivedObjectLoader(p) +SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o): + DataFile::DerivedObjectLoader(p), + FeatureConditional(p, p.name), + options(o) { - init(&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); - add("library", &Loader::component); - add("module", &Loader::component); - add("install", &Loader::component); + 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, 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); add("version", &Loader::version); } void SourcePackage::Loader::finish() { - obj.components.sort(component_sort); + /* Make sure the source tarball is last in the list so targets from all + other components wil be created first */ + auto i = find(obj.components, obj.source_archive); + if(i!=obj.components.end()) + obj.components.splice(obj.components.end(), obj.components, i); } void SourcePackage::Loader::feature(const string &n, const string &d) @@ -201,17 +208,25 @@ 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); } } -template +template void SourcePackage::Loader::component(const string &n) { - Component comp(obj, t, n); - load_sub(comp); + C *comp = new C(obj, n); + load_sub(*comp); + obj.components.push_back(comp); +} + +template +void SourcePackage::Loader::component_arg(A a, const string &n) +{ + C *comp = new C(obj, n, a); + load_sub(*comp); obj.components.push_back(comp); } @@ -227,14 +242,6 @@ void SourcePackage::Loader::generate(const string &tag) obj.local_tools.add_tool(gen); } -void SourcePackage::Loader::if_feature(const string &cond) -{ - bool match = obj.match_feature(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; @@ -242,15 +249,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 &) { - Component trbl(obj, Component::TARBALL, n); - load_sub(trbl); + IO::print("%s: Deprecated tarball component ignored\n", get_source()); } void SourcePackage::Loader::version(const string &v)