X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=4e7f547f36f7d05b9212a09f957907e1c79c75a8;hb=45571f0fffaf483d07d92f56ae20f00218b7463c;hp=566cf8896b3988553b9457be1996a455d252d064;hpb=c51e8844f19c31b2809ba459a1659d3b94a86f89;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 566cf88..4e7f547 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "booleanevaluator.h" #include "builder.h" #include "component.h" #include "csourcefile.h" @@ -59,15 +60,14 @@ void Component::create_build_info() } final_build_info.update_from(package.get_build_info()); + final_build_info.update_from(build_info); + build_info = final_build_info; for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) *i = (package.get_source_directory() / *i).str(); for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) *i = (package.get_source_directory() / *i).str(); - final_build_info.update_from(build_info); - build_info = final_build_info; - for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) { /* Select an include path that contains all the sources for this and the @@ -82,7 +82,7 @@ void Component::create_build_info() build_info.libs.push_back((*i)->get_name()); if(!(*i)->get_install()) { - build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; + build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; build_info.libpath.push_back((*i)->get_package().get_source_directory()); } } @@ -90,15 +90,6 @@ void Component::create_build_info() if(type==LIBRARY || type==MODULE) if(build_info.libmodeget_exported_build_info(); - build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); - } - } } BuildInfo Component::get_build_info_for_path(const FS::Path &path) const @@ -138,7 +129,7 @@ void Component::create_targets() const string inst_loc; if(type==TARBALL) { - const Tool &tar = toolchain.get_tool("TAR"); + Tool &tar = toolchain.get_tool("TAR"); list files; for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) @@ -171,7 +162,7 @@ void Component::create_targets() const else if(type==INSTALL) { Target *inst = build_graph.get_target("install"); - const Tool © = toolchain.get_tool("CP"); + Tool © = toolchain.get_tool("CP"); for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; @@ -184,7 +175,7 @@ void Component::create_targets() const } else if(type==DATAPACK) { - const Tool &dcomp = toolchain.get_tool("DATA"); + Tool &dcomp = toolchain.get_tool("DATA"); list files; for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) @@ -211,13 +202,28 @@ void Component::create_targets() const if(type==PROGRAM || type==LIBRARY || type==MODULE) { list objs; + const Toolchain &pkg_tools = package.get_toolchain(); for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); - const Tool *tool = toolchain.get_tool_for_suffix(ext, true); + Target *src = 0; + + Tool *gen = pkg_tools.get_tool_for_suffix(ext); + if(gen) + { + Target *tmpl = gen->create_source(*this, *i); + if(tmpl) + { + src = gen->create_target(*tmpl); + ext = FS::extpart(FS::basename(dynamic_cast(*src).get_path())); + } + } + + Tool *tool = toolchain.get_tool_for_suffix(ext, true); if(tool) { - Target *src = tool->create_source(*this, *i); + if(!src) + src = tool->create_source(*this, *i); if(!src) continue; @@ -227,17 +233,25 @@ void Component::create_targets() const objs.push_back(obj); } - if(type==LIBRARY && install && dynamic_cast(src)->is_installable()) - build_graph.add_installed_target(*src); + if(type==LIBRARY && install) + { + if(dynamic_cast(src)->is_installable()) + build_graph.add_installed_target(*src); + + const Target::Dependencies &side_effects = src->get_side_effects(); + for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j) + if(dynamic_cast(*j)->is_installable()) + build_graph.add_installed_target(**j); + } } } - const Tool &linker = toolchain.get_tool("LINK"); + Tool &linker = toolchain.get_tool("LINK"); list results; if(type==LIBRARY) { - const Tool &archiver = toolchain.get_tool("AR"); + Tool &archiver = toolchain.get_tool("AR"); results.push_back(linker.create_target(objs, "shared")); results.push_back(archiver.create_target(objs)); } @@ -317,7 +331,8 @@ void Component::Loader::build_info() void Component::Loader::if_arch(const string &cond) { - bool match = obj.package.get_builder().get_current_arch().match_name(cond); + BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false); + bool match = eval.evaluate(cond); obj.package.get_builder().get_logger().log("configure", format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not "))); if(match) @@ -326,7 +341,8 @@ void Component::Loader::if_arch(const string &cond) void Component::Loader::if_feature(const string &cond) { - bool match = obj.package.match_feature(cond); + BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature)); + bool match = eval.evaluate(cond); obj.package.get_builder().get_logger().log("configure", format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not "))); if(match) @@ -348,6 +364,8 @@ void Component::Loader::require(const string &n) Package *req = obj.package.get_builder().get_package_manager().find_package(n); if(req) obj.requires.push_back(req); + else + obj.problems.push_back(format("Required package %s not found", n)); } void Component::Loader::source(const string &s)