X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=1de15ef86781ae2696fa114eb7b3c8c0d6e344ef;hb=4699c9eb82fb55268976fda87f1f4bf5f7df95a4;hp=ab66c0056651cbfddaa768fed2dbb47577779870;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index ab66c00..1de15ef 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -23,42 +23,37 @@ 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), + build_type(0), config(*this), deps_cache(*this) { components.push_back(Component(*this, Component::TARBALL, "@src")); } +void SourcePackage::set_build_type(const BuildType &t) +{ + build_type = &t; +} + FS::Path SourcePackage::get_temp_dir() const { - string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value); + string subdir = builder.get_current_arch().get_name(); + if(build_type) + { + subdir += '.'; + subdir += build_type->get_name(); + } return source/config.get_option("tempdir").value/subdir; } 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/config.get_option("outdir").value; + return source/detail; else - 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; + return source/arch.get_name()/detail; } LibMode SourcePackage::get_library_mode() const @@ -122,18 +117,10 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) { init_config(); - StringMap::const_iterator prof = opts.find("profile"); - if(prof!=opts.end() && flag) - config.select_profile(prof->second); - else - config.select_last_profile(); + config.load(); if(flag && config.update(opts)) - { builder.get_logger().log("configure", format("Configuration of %s changed", name)); - if(!builder.get_dry_run()) - config.save(); - } config.finish(); @@ -161,12 +148,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag) 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", "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) @@ -182,33 +164,24 @@ void SourcePackage::init_config() 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()); - 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) - 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") - { - if(optimize=="s" || optimize=="size") - build_info.optimize = -1; - else - build_info.optimize = lexical_cast(optimize); - } + 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(lexical_cast(config.get_option("debug").value)) + if(export_paths) { - build_info.debug = true; - build_info.defines["DEBUG"] = "1"; + export_binfo.incpath.push_back((builder.get_prefix()/"include").str()); + export_binfo.libpath.push_back((builder.get_prefix()/"lib").str()); } for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i) @@ -233,20 +206,26 @@ void SourcePackage::create_targets() 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) + if(i->get_type()==Component::LIBRARY) 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)); + 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); @@ -256,7 +235,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); @@ -265,8 +244,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) @@ -275,43 +268,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); } } @@ -319,8 +319,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()); }