X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9d8a5656935ac02a30581e715455c6bdfb5a5486;hb=82ae60a647ebb9567f7177c353245f4d72faaf5e;hp=22330b2970dd4184db97d783a6646be4bc30da4f;hpb=7bf0b5d013b88b0408031e2d6594357e71c8138f;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 22330b2..9d8a565 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -6,7 +6,6 @@ #include "binarypackage.h" #include "builder.h" #include "file.h" -#include "misc.h" #include "pkgconfigfile.h" #include "tool.h" #include "sourcepackage.h" @@ -35,6 +34,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f): if(!build_file) build_file = new File(builder, *this, f); components.push_back(Component(*this, Component::TARBALL, "@src")); + source_tarball = &components.back(); } void SourcePackage::set_build_type(const BuildType &t) @@ -61,14 +61,13 @@ FS::Path SourcePackage::get_temp_dir() const FS::Path SourcePackage::get_out_dir() const { const Architecture &arch = builder.get_current_arch(); - string detail = (build_type ? build_type->get_name() : string()); if(arch.is_native()) - return source_dir/detail; + return source_dir; else - return source_dir/arch.get_name()/detail; + return source_dir/arch.get_name(); } -void SourcePackage::create_build_info() +void SourcePackage::do_prepare() { BuildInfo final_build_info; @@ -103,10 +102,7 @@ void SourcePackage::create_build_info() export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); } -} -void SourcePackage::create_targets() -{ cache.load(); bool pc_needed = false; @@ -132,13 +128,13 @@ void SourcePackage::save_caches() SourcePackage::Loader::Loader(SourcePackage &p): - DataFile::DerivedObjectLoader(p) + DataFile::DerivedObjectLoader(p) { init(0); } SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): - DataFile::DerivedObjectLoader(p) + DataFile::DerivedObjectLoader(p) { init(&o); } @@ -146,21 +142,22 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o): void SourcePackage::Loader::init(const Config::InputOptions *o) { options = o; - add("version", &SourcePackage::version); add("description", &SourcePackage::description); add("build_info", &Loader::build_info); add("feature", &Loader::feature); add("if", &Loader::condition); - add("if_arch", &Loader::if_arch); - add("if_feat", &Loader::if_feature); + 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("source_tarball", &Loader::source_tarball); add("tarball", &Loader::tarball); add("tar_file", &Loader::tar_file); + add("version", &Loader::version); } void SourcePackage::Loader::finish() @@ -171,10 +168,11 @@ void SourcePackage::Loader::finish() { for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j) { - const StringList &sources = j->get_sources(); - for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k) + const Component::SourceList &sources = j->get_sources(); + for(Component::SourceList::const_iterator k=sources.begin(); k!=sources.end(); ++k) { - if(!i->first.compare(0, k->size(), *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); } @@ -226,19 +224,9 @@ void SourcePackage::Loader::headers(const string &n) IO::print("%s: Note: headers components are deprecated\n", get_source()); Component comp(obj, Component::LIBRARY, n); load_sub(comp); - const StringList &sources = comp.get_sources(); - for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) - install_map[*i] = "include/"+comp.get_name(); -} - -void SourcePackage::Loader::if_arch(const string &cond) -{ - const Architecture &arch = obj.builder.get_current_arch(); - bool negate = (cond[0]=='!'); - bool match = (arch.match_name(cond.substr(negate))!=negate); - obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not "))); - if(match) - load_sub_with(*this); + 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(); } void SourcePackage::Loader::if_feature(const string &cond) @@ -248,7 +236,7 @@ void SourcePackage::Loader::if_feature(const string &cond) if(equals!=string::npos) { if(equals==0) - error("No feature name specified"); + 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; @@ -267,13 +255,24 @@ void SourcePackage::Loader::if_feature(const string &cond) load_sub_with(*this); } +void SourcePackage::Loader::interface_version(const string &v) +{ + obj.interface_version = v; + if(obj.version.empty()) + obj.version = v; +} + +void SourcePackage::Loader::source_tarball() +{ + load_sub(*obj.source_tarball); +} + void SourcePackage::Loader::tarball(const string &n) { if(n=="@src") { - for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i) - if(i->get_type()==Component::TARBALL && i->get_name()==n) - load_sub(*i); + IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source()); + load_sub(*obj.source_tarball); } else { @@ -287,5 +286,16 @@ 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()); + const_cast(i->get_sources()).push_back((obj.source_dir/f).str()); +} + +void SourcePackage::Loader::version(const string &v) +{ + obj.version = v; + + string::size_type i = 0; + for(unsigned dots=0; i=2) + break; + obj.interface_version = obj.version.substr(0, i); }