X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ddfa00fb9bf3175eb59a7391b2e16cd38555370b;hb=8ee4fd693c8d15265f0c145221737a322f89618b;hp=9d8a5656935ac02a30581e715455c6bdfb5a5486;hpb=e15bd086a1ef924b7986d18a1c5b3d31f54a01de;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 9d8a565..ddfa00f 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -4,10 +4,12 @@ #include #include #include "binarypackage.h" +#include "booleanevaluator.h" #include "builder.h" #include "file.h" #include "pkgconfigfile.h" #include "tool.h" +#include "sourcegenerator.h" #include "sourcepackage.h" using namespace std; @@ -37,12 +39,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f): source_tarball = &components.back(); } -void SourcePackage::set_build_type(const BuildType &t) -{ - build_type = &t; -} - -FS::Path SourcePackage::get_temp_dir() const +FS::Path SourcePackage::get_temp_directory() const { string subdir = builder.get_current_arch().get_name(); if(build_type) @@ -58,7 +55,7 @@ FS::Path SourcePackage::get_temp_dir() const return source_dir/temp/subdir; } -FS::Path SourcePackage::get_out_dir() const +FS::Path SourcePackage::get_output_directory() const { const Architecture &arch = builder.get_current_arch(); if(arch.is_native()) @@ -67,6 +64,20 @@ FS::Path SourcePackage::get_out_dir() const return source_dir/arch.get_name(); } +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 + return lexical_cast(value); +} + +void SourcePackage::set_build_type(const BuildType &t) +{ + build_type = &t; +} + void SourcePackage::do_prepare() { BuildInfo final_build_info; @@ -81,8 +92,14 @@ void SourcePackage::do_prepare() build_info.libpath.push_back((builder.get_prefix()/"lib").str()); for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) - if(lexical_cast(config.get_option("with_"+i->name).value)) - build_info.defines["WITH_"+toupper(i->name)] = "1"; + { + 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) @@ -116,7 +133,7 @@ void SourcePackage::do_prepare() if(pc_needed) { PkgConfigFile *pc = new PkgConfigFile(builder, *this); - builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc)); + builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc)); } } @@ -145,67 +162,40 @@ void SourcePackage::Loader::init(const Config::InputOptions *o) add("description", &SourcePackage::description); add("build_info", &Loader::build_info); add("feature", &Loader::feature); - add("if", &Loader::condition); + add("generate", &Loader::generate); add("if_feature", &Loader::if_feature); add("program", &Loader::component); add("library", &Loader::component); add("module", &Loader::component); - add("headers", &Loader::headers); add("install", &Loader::component); add("interface_version", &Loader::interface_version); - add("datafile", &Loader::component); + add("datapack", &Loader::component); add("source_tarball", &Loader::source_tarball); add("tarball", &Loader::tarball); - add("tar_file", &Loader::tar_file); add("version", &Loader::version); } void SourcePackage::Loader::finish() { obj.components.sort(component_sort); - - for(map::const_iterator i=install_map.begin(); i!=install_map.end(); ++i) - { - for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j) - { - const Component::SourceList &sources = j->get_sources(); - for(Component::SourceList::const_iterator k=sources.begin(); k!=sources.end(); ++k) - { - string k_str = k->str(); - if(!i->first.compare(0, k_str.size(), k_str)) - { - const_cast(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second); - } - } - } - } } void SourcePackage::Loader::feature(const string &n, const string &d) { Feature feat(n); - feat.descr = d; - feat.def_value = "no"; + feat.description = d; load_sub(feat); obj.features.push_back(feat); - string config_key = "with_"+feat.name; - obj.config.add_option(config_key, feat.def_value, feat.descr); + + const Config::Option &opt = obj.config.add_option(feat); if(options) { - Config::InputOptions::const_iterator i = options->find(config_key); + Config::InputOptions::const_iterator i = options->find(opt.name); if(i!=options->end()) - obj.config.set_option(config_key, i->second); + obj.config.set_option(opt.name, i->second); } } -void SourcePackage::Loader::condition(const string &c) -{ - IO::print("%s: Note: Old-style conditions are deprecated\n", get_source()); - Condition cond(obj, c); - if(cond.eval()) - load_sub_with(*this); -} - template void SourcePackage::Loader::component(const string &n) { @@ -219,37 +209,17 @@ void SourcePackage::Loader::build_info() load_sub(obj.build_info); } -void SourcePackage::Loader::headers(const string &n) +void SourcePackage::Loader::generate(const string &tag) { - IO::print("%s: Note: headers components are deprecated\n", get_source()); - Component comp(obj, Component::LIBRARY, n); - load_sub(comp); - const Component::SourceList &sources = comp.get_sources(); - for(Component::SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) - install_map[i->str()] = "include/"+comp.get_name(); + SourceGenerator *gen = new SourceGenerator(obj.builder, obj, tag); + load_sub(*gen); + obj.local_tools.add_tool(gen); } void SourcePackage::Loader::if_feature(const string &cond) { - bool match = false; - string::size_type equals = cond.find('='); - if(equals!=string::npos) - { - if(equals==0) - throw invalid_argument("SourcePackage::Loader::if_feature"); - bool negate = cond[equals-1]=='!'; - string name = cond.substr(0, equals-negate); - string value = obj.config.get_option("with_"+name).value; - match = (value==cond.substr(equals+1))!=negate; - value = cond.substr(equals+1); - } - else - { - bool negate = (cond[0]=='!'); - string name = cond.substr(negate); - string value = obj.config.get_option("with_"+name).value; - match = lexical_cast(value)!=negate; - } + 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); @@ -269,24 +239,8 @@ void SourcePackage::Loader::source_tarball() void SourcePackage::Loader::tarball(const string &n) { - if(n=="@src") - { - IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source()); - load_sub(*obj.source_tarball); - } - else - { - Component trbl(obj, Component::TARBALL, n); - load_sub(trbl); - } -} - -void SourcePackage::Loader::tar_file(const string &f) -{ - IO::print("%s: Note: tar_file is deprecated\n", get_source()); - for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i) - if(i->get_type()==Component::TARBALL && i->get_name()=="@src") - const_cast(i->get_sources()).push_back((obj.source_dir/f).str()); + Component trbl(obj, Component::TARBALL, n); + load_sub(trbl); } void SourcePackage::Loader::version(const string &v)