X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=63f3bba5848c47c4bbaa6c534dd3bb7e9a41d4ab;hb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;hp=838ab16ed53d2b1e0c7180d4972827f4c15fce82;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 838ab16..63f3bba 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,7 +31,8 @@ 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 @@ -56,9 +53,7 @@ unsigned SourcePackage::get_install_flags() 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; + flags |= LIB|INCLUDE; } return flags; @@ -74,7 +69,51 @@ 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+1=2) - IO::print("Configuration of %s changed\n", name); + builder.get_logger().log("configure", format("Configuration of %s changed", name)); if(!builder.get_dry_run()) config.save(); } @@ -102,18 +140,10 @@ 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); } - 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); @@ -122,6 +152,9 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) } deps_cache.load(); + + for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i) + i->configure(opts, flag); } void SourcePackage::init_config() @@ -129,10 +162,9 @@ 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("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("cpu", "none", "CPU type to optimize for"); config.add_option("staticlibs", "local", "Use static libraries"); for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) @@ -148,16 +180,6 @@ 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(); build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end()); @@ -173,30 +195,27 @@ void SourcePackage::create_build_info() export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); string optimize = config.get_option("optimize").value; - if(lexical_cast(optimize)) + 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) { @@ -204,13 +223,28 @@ 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)); + } } -SourcePackage::Loader::Loader(Package &p): - Package::Loader(p) +SourcePackage::Loader::Loader(SourcePackage &p): + DataFile::DerivedObjectLoader(p) { add("version", &SourcePackage::version); add("description", &SourcePackage::description); @@ -220,7 +254,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); @@ -229,8 +263,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) @@ -239,43 +287,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); } } @@ -283,8 +338,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); + const_cast(i->get_sources()).push_back((obj.source/f).str()); }