X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=02e9152a7b3ef52abcf5042bcf41d56516b7ac0a;hb=06678c3bb61404c483e4b9c39eaa7e7fb3f40c62;hp=a466089ae75aad13b049d5e5e3660a930f597ec3;hpb=8d7926359d2477a9928d7367678314bcbc1f6e81;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index a466089..02e9152 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of builder -Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include #include @@ -12,6 +5,8 @@ Distributed under the LGPL #include "binarypackage.h" #include "builder.h" #include "misc.h" +#include "pkgconfigfile.h" +#include "tool.h" #include "sourcepackage.h" using namespace std; @@ -49,23 +44,6 @@ FS::Path SourcePackage::get_out_dir() const return source/arch.get_name()/config.get_option("outdir").value; } -unsigned SourcePackage::get_install_flags() -{ - unsigned flags = 0; - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - if(i->get_install()) - { - if(i->get_type()==Component::PROGRAM) - flags |= BIN; - else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE) - flags |= LIB; - else if(i->get_type()==Component::HEADERS) - flags |= INCLUDE; - } - - return flags; -} - LibMode SourcePackage::get_library_mode() const { const string &mode = config.get_option("staticlibs").value; @@ -76,7 +54,7 @@ LibMode SourcePackage::get_library_mode() const else if(mode=="none") return DYNAMIC; else - throw Exception("Unknown library mode"); + throw runtime_error("unknown library mode"); } string SourcePackage::expand_string(const string &str) const @@ -87,7 +65,7 @@ string SourcePackage::expand_string(const string &str) const while((dollar = result.find('$'))!=string::npos) { if(n>1000) - throw Exception("Too much variable expansions"); + throw bad_expansion("nested too deep"); string::size_type end; string var; @@ -95,7 +73,7 @@ string SourcePackage::expand_string(const string &str) const { end = result.find('}', dollar+2); if(end==string::npos) - throw Exception("Unterminated variable reference"); + throw bad_expansion("unterminated variable reference"); var = result.substr(dollar+2, end-dollar-2); ++end; } @@ -134,12 +112,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) config.select_last_profile(); if(flag && config.update(opts)) - { - if(builder.get_verbose()>=2) - IO::print("Configuration of %s changed\n", name); - if(!builder.get_dry_run()) - config.save(); - } + builder.get_logger().log("configure", format("Configuration of %s changed", name)); config.finish(); @@ -148,7 +121,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) { const StringList &reqs = i->get_requires(); for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) - if(Package *pkg = builder.get_package(*j)) + if(Package *pkg = builder.get_package_manager().find_package(*j)) requires.push_back(pkg); } @@ -188,44 +161,45 @@ void SourcePackage::init_config() void SourcePackage::create_build_info() { - build_info.add(builder.get_current_arch().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()); - unsigned flags = get_install_flags(); - build_info.incpath.push_back((builder.get_prefix()/"include").str()); build_info.libpath.push_back((builder.get_prefix()/"lib").str()); - if(flags&INCLUDE) + bool export_paths = false; + for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i) + export_paths = (i->get_type()==Component::LIBRARY); + + if(export_paths) + { export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); - if(flags&LIB) export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); + } string optimize = config.get_option("optimize").value; if(!optimize.empty() && optimize!="0") { - build_info.cflags.push_back("-O"+optimize); - build_info.ldflags.push_back("-O"+optimize); + if(optimize=="s" || optimize=="size") + build_info.optimize = -1; + else + build_info.optimize = lexical_cast(optimize); } if(lexical_cast(config.get_option("debug").value)) { - build_info.cflags.push_back("-ggdb"); - build_info.defines.push_back("DEBUG"); + build_info.debug = true; + build_info.defines["DEBUG"] = "1"; } for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) if(lexical_cast(config.get_option("with_"+i->name).value)) - build_info.cflags.push_back("-DWITH_"+toupper(i->name)); + build_info.defines["WITH_"+toupper(i->name)] = "1"; for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) if(i->eval()) - build_info.add(i->get_build_info()); - - build_info.unique(); + build_info.update_from(i->get_build_info()); for(list::iterator i=components.begin(); i!=components.end(); ++i) { @@ -233,13 +207,34 @@ void SourcePackage::create_build_info() if(i->get_type()==Component::LIBRARY) export_binfo.libs.push_back(i->get_name()); } +} + +void SourcePackage::create_targets() +{ + bool pc_needed = false; + for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) + { + i->create_targets(); + if(i->get_type()==Component::LIBRARY) + pc_needed = true; + } - export_binfo.unique(); + if(pc_needed) + { + PkgConfigFile *pc = new PkgConfigFile(builder, *this); + builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc)); + } +} + +void SourcePackage::save_caches() +{ + config.save(); + deps_cache.save(); } -SourcePackage::Loader::Loader(Package &p): - Package::Loader(p) +SourcePackage::Loader::Loader(SourcePackage &p): + DataFile::DerivedObjectLoader(p) { add("version", &SourcePackage::version); add("description", &SourcePackage::description); @@ -249,7 +244,7 @@ SourcePackage::Loader::Loader(Package &p): add("program", &Loader::component); add("library", &Loader::component); add("module", &Loader::component); - add("headers", &Loader::component); + add("headers", &Loader::headers); add("install", &Loader::component); add("datafile", &Loader::component); add("tarball", &Loader::tarball); @@ -258,8 +253,22 @@ SourcePackage::Loader::Loader(Package &p): void SourcePackage::Loader::finish() { - SourcePackage &spkg = static_cast(pkg); - spkg.components.sort(component_sort); + 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 StringList &sources = j->get_sources(); + for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k) + { + if(!i->first.compare(0, k->size(), *k)) + { + const_cast(j->get_install_map()).add_mapping(obj.source/i->first, i->second); + } + } + } + } } void SourcePackage::Loader::feature(const string &n, const string &d) @@ -268,43 +277,50 @@ void SourcePackage::Loader::feature(const string &n, const string &d) feat.descr = d; feat.def_value = "no"; load_sub(feat); - static_cast(pkg).features.push_back(feat); + obj.features.push_back(feat); } void SourcePackage::Loader::condition(const string &c) { - SourcePackage &spkg = static_cast(pkg); - Condition cond(spkg, c); + Condition cond(obj, c); load_sub(cond); - spkg.conditions.push_back(cond); + obj.conditions.push_back(cond); } template void SourcePackage::Loader::component(const string &n) { - SourcePackage &spkg = static_cast(pkg); - Component comp(spkg, t, n); + Component comp(obj, t, n); load_sub(comp); - spkg.components.push_back(comp); + obj.components.push_back(comp); } void SourcePackage::Loader::build_info() { - load_sub(static_cast(pkg).build_info); + load_sub(obj.build_info); +} + +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::tarball(const string &n) { - SourcePackage &spkg = static_cast(pkg); if(n=="@src") { - for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i) + 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); } else { - Component trbl(spkg, Component::TARBALL, n); + Component trbl(obj, Component::TARBALL, n); load_sub(trbl); } } @@ -312,8 +328,7 @@ void SourcePackage::Loader::tarball(const string &n) void SourcePackage::Loader::tar_file(const string &f) { IO::print("%s: Note: tar_file is deprecated\n", get_source()); - SourcePackage &spkg = static_cast(pkg); - for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i) + 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((spkg.source/f).str()); + const_cast(i->get_sources()).push_back((obj.source/f).str()); }