X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=4b45bb73b643a5f7b3934f51bed4a40b2a1ad036;hb=d861af0938a9043270245f6973d4ddbdc94e75b4;hp=029d5240faecb84541ce70a54421dfbd9c95a27d;hpb=398983749391592988daca0c9b62b3d38f86e4e6;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 029d524..4b45bb7 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -22,11 +22,13 @@ bool component_sort(const Component &c1, const Component &c2) SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s): Package(b, n), - source(s), + source_dir(s), build_type(0), config(*this), deps_cache(*this) { + config.load(); + components.push_back(Component(*this, Component::TARBALL, "@src")); } @@ -48,7 +50,7 @@ FS::Path SourcePackage::get_temp_dir() const if(temp.is_absolute()) return temp/name/subdir; else - return source/temp/subdir; + return source_dir/temp/subdir; } FS::Path SourcePackage::get_out_dir() const @@ -56,99 +58,9 @@ 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/detail; + return source_dir/detail; else - return source/arch.get_name()/detail; -} - -string SourcePackage::expand_string(const string &str) const -{ - string result = str; - string::size_type dollar = 0; - unsigned n = 0; - while((dollar = result.find('$'))!=string::npos) - { - if(n>1000) - throw bad_expansion("nested too deep"); - - string::size_type end; - string var; - if(dollar+1eval()) - { - const StringList &reqs = i->get_requires(); - for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) - if(Package *pkg = builder.get_package_manager().find_package(*j)) - requires.push_back(pkg); - } - - for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) - { - BinaryPackage *bpkg = dynamic_cast(*i); - if(bpkg && bpkg->get_need_path()) - bpkg->set_path(config.get_option(bpkg->get_name()+"_path").value); - } - - deps_cache.load(); - - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - i->configure(opts, flag); -} - -void SourcePackage::init_config() -{ - for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) - config.add_option("with_"+i->name, i->def_value, i->descr); - - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) - { - BinaryPackage *bpkg = dynamic_cast(*i); - if(bpkg && bpkg->get_need_path()) - config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name()); - } + return source_dir/arch.get_name()/detail; } void SourcePackage::create_build_info() @@ -156,10 +68,6 @@ void SourcePackage::create_build_info() if(build_type) build_info.update_from(build_type->get_build_info()); - // XXX Currently, a package-specific settings will override cmdline. This might or might not be desirable. - const StringList &warnings = builder.get_warnings(); - build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end()); - build_info.incpath.push_back((builder.get_prefix()/"include").str()); build_info.libpath.push_back((builder.get_prefix()/"lib").str()); @@ -177,12 +85,9 @@ void SourcePackage::create_build_info() if(lexical_cast(config.get_option("with_"+i->name).value)) build_info.defines["WITH_"+toupper(i->name)] = "1"; - for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) - if(i->eval()) - build_info.update_from(i->get_build_info()); - for(list::iterator i=components.begin(); i!=components.end(); ++i) { + i->prepare(); i->create_build_info(); if(i->get_type()==Component::LIBRARY) export_binfo.libs.push_back(i->get_name()); @@ -191,6 +96,8 @@ void SourcePackage::create_build_info() void SourcePackage::create_targets() { + deps_cache.load(); + bool pc_needed = false; for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) { @@ -202,7 +109,7 @@ void SourcePackage::create_targets() if(pc_needed) { PkgConfigFile *pc = new PkgConfigFile(builder, *this); - builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc)); + builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc)); } } @@ -216,11 +123,25 @@ 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) +{ + init(&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("program", &Loader::component); add("library", &Loader::component); add("module", &Loader::component); @@ -244,7 +165,7 @@ void SourcePackage::Loader::finish() { if(!i->first.compare(0, k->size(), *k)) { - const_cast(j->get_install_map()).add_mapping(obj.source/i->first, i->second); + const_cast(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second); } } } @@ -258,13 +179,22 @@ void SourcePackage::Loader::feature(const string &n, const string &d) feat.def_value = "no"; 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); + if(options) + { + Config::InputOptions::const_iterator i = options->find(config_key); + if(i!=options->end()) + obj.config.set_option(config_key, 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); - load_sub(cond); - obj.conditions.push_back(cond); + if(cond.eval()) + load_sub_with(*this); } template @@ -290,6 +220,42 @@ void SourcePackage::Loader::headers(const string &n) 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); +} + +void SourcePackage::Loader::if_feature(const string &cond) +{ + bool match = false; + string::size_type equals = cond.find('='); + if(equals!=string::npos) + { + if(equals==0) + error("No feature name specified"); + 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; + } + 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::tarball(const string &n) { if(n=="@src") @@ -310,5 +276,5 @@ 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/f).str()); + const_cast(i->get_sources()).push_back((obj.source_dir/f).str()); }