X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=d66a36fb4b247c289db1825df1f8c2e667fb7543;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=54de8f6a7cf076c178c95440d70ba4cb614d1c67;hpb=5006279d7b92e578ecfa8a04186f675c6b9f1eea;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 54de8f6..d66a36f 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -1,16 +1,12 @@ -/* $Id$ - -This file is part of builder -Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include #include #include #include #include "binarypackage.h" #include "builder.h" #include "misc.h" +#include "pkgconfigfile.h" +#include "tool.h" #include "sourcepackage.h" using namespace std; @@ -35,12 +31,13 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s): FS::Path SourcePackage::get_temp_dir() const { - return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value; + string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value); + return source/config.get_option("tempdir").value/subdir; } FS::Path SourcePackage::get_out_dir() const { - const Architecture &arch=builder.get_current_arch(); + const Architecture &arch = builder.get_current_arch(); if(arch.is_native()) return source/config.get_option("outdir").value; else @@ -49,16 +46,16 @@ FS::Path SourcePackage::get_out_dir() const unsigned SourcePackage::get_install_flags() { - unsigned flags=0; + 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; + flags |= BIN; else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE) - flags|=LIB; + flags |= LIB; else if(i->get_type()==Component::HEADERS) - flags|=INCLUDE; + flags |= INCLUDE; } return flags; @@ -66,7 +63,7 @@ unsigned SourcePackage::get_install_flags() LibMode SourcePackage::get_library_mode() const { - const string &mode=config.get_option("staticlibs").value; + const string &mode = config.get_option("staticlibs").value; if(mode=="all") return ALL_STATIC; else if(mode=="local") @@ -74,14 +71,58 @@ 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 +{ + 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+1second); else @@ -100,31 +141,23 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) if(i->eval()) { - const StringList &reqs=i->get_requires(); + 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); } - base_reqs=requires; - - for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) - { - const PackageList &reqs=i->get_requires(); - requires.insert(requires.end(), reqs.begin(), reqs.end()); - } - for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i) { - BinaryPackage *bpkg=dynamic_cast(*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(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) - (*i)->configure(opts, flag&2);*/ + for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) + i->configure(opts, flag); } void SourcePackage::init_config() @@ -132,18 +165,17 @@ void SourcePackage::init_config() config.add_option("profile", "default", "Configuration profile"); config.add_option("tempdir", "temp", "Directory for storing temporary files"); config.add_option("outdir", ".", "Directory to put build results in"); - config.add_option("optimize", "0", "Apply compiler optimizations"); - config.add_option("strip", "0", "Strip symbols from programs"); - config.add_option("debug", "0", "Produce debugging symbols"); - config.add_option("cpu", "none", "CPU type to optimize for"); + config.add_option("optimize", "0", "Compiler optimization level"); + config.add_option("strip", "no", "Strip symbols from programs"); + config.add_option("debug", "no", "Produce debugging symbols"); config.add_option("staticlibs", "local", "Use static libraries"); for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) - config.add_option("with_"+i->name, "0", i->descr); + 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); + BinaryPackage *bpkg = dynamic_cast(*i); if(bpkg && bpkg->get_need_path()) config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name()); } @@ -151,21 +183,11 @@ void SourcePackage::init_config() void SourcePackage::create_build_info() { - for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i) - { - const BuildInfo &ebi=(*i)->get_exported_binfo(); - build_info.add(ebi); - - export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end()); - export_binfo.incpath.insert(export_binfo.incpath.end(), ebi.incpath.begin(), ebi.incpath.end()); - export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end()); - } - // XXX Currently, a package-specific settings will override cmdline. This might or might not be desirable. - const StringList &warnings=builder.get_warnings(); + const StringList &warnings = builder.get_warnings(); build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end()); - unsigned flags=get_install_flags(); + 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()); @@ -175,31 +197,28 @@ void SourcePackage::create_build_info() if(flags&LIB) export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); - string optimize=config.get_option("optimize").value; - if(lexical_cast(optimize)) + 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); - string cpu=config.get_option("cpu").value; - if(cpu!="none") - build_info.cflags.push_back("-march="+cpu); + 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) { @@ -207,8 +226,23 @@ void SourcePackage::create_build_info() if(i->get_type()==Component::LIBRARY) export_binfo.libs.push_back(i->get_name()); } +} - export_binfo.unique(); +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 || i->get_type()==Component::HEADERS) + pc_needed = true; + } + + if(pc_needed) + { + PkgConfigFile *pc = new PkgConfigFile(builder, *this); + builder.get_target("install")->add_depend(builder.get_toolchain().get_tool("CP").create_target(*pc)); + } } @@ -220,63 +254,46 @@ SourcePackage::Loader::Loader(Package &p): add("build_info", &Loader::build_info); add("feature", &Loader::feature); add("if", &Loader::condition); - add("program", &Loader::program); - add("library", &Loader::library); - add("module", &Loader::module); - add("headers", &Loader::headers); + add("program", &Loader::component); + add("library", &Loader::component); + add("module", &Loader::component); + add("headers", &Loader::component); + add("install", &Loader::component); + add("datafile", &Loader::component); add("tarball", &Loader::tarball); add("tar_file", &Loader::tar_file); } void SourcePackage::Loader::finish() { - SourcePackage &spkg=static_cast(pkg); + SourcePackage &spkg = static_cast(pkg); spkg.components.sort(component_sort); } void SourcePackage::Loader::feature(const string &n, const string &d) { - static_cast(pkg).features.push_back(Feature(n, d)); + Feature feat(n); + feat.descr = d; + feat.def_value = "no"; + load_sub(feat); + static_cast(pkg).features.push_back(feat); } void SourcePackage::Loader::condition(const string &c) { - SourcePackage &spkg=static_cast(pkg); + SourcePackage &spkg = static_cast(pkg); Condition cond(spkg, c); load_sub(cond); spkg.conditions.push_back(cond); } -void SourcePackage::Loader::program(const string &n) -{ - SourcePackage &spkg=static_cast(pkg); - Component prog(spkg, Component::PROGRAM, n); - load_sub(prog); - spkg.components.push_back(prog); -} - -void SourcePackage::Loader::library(const string &n) -{ - SourcePackage &spkg=static_cast(pkg); - Component prog(spkg, Component::LIBRARY, n); - load_sub(prog); - spkg.components.push_back(prog); -} - -void SourcePackage::Loader::module(const string &n) -{ - SourcePackage &spkg=static_cast(pkg); - Component prog(spkg, Component::MODULE, n); - load_sub(prog); - spkg.components.push_back(prog); -} - -void SourcePackage::Loader::headers(const string &n) +template +void SourcePackage::Loader::component(const string &n) { - SourcePackage &spkg=static_cast(pkg); - Component prog(spkg, Component::HEADERS, n); - load_sub(prog); - spkg.components.push_back(prog); + SourcePackage &spkg = static_cast(pkg); + Component comp(spkg, t, n); + load_sub(comp); + spkg.components.push_back(comp); } void SourcePackage::Loader::build_info() @@ -286,7 +303,7 @@ void SourcePackage::Loader::build_info() void SourcePackage::Loader::tarball(const string &n) { - SourcePackage &spkg=static_cast(pkg); + SourcePackage &spkg = static_cast(pkg); if(n=="@src") { for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i) @@ -303,8 +320,8 @@ 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); + SourcePackage &spkg = static_cast(pkg); for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i) if(i->get_type()==Component::TARBALL && i->get_name()=="@src") - const_cast(i->get_sources()).push_back(spkg.source/f); + const_cast(i->get_sources()).push_back((spkg.source/f).str()); }