X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomponent.cpp;h=5e918c841719967b99f904c0d3c5fae05aaeb158;hb=43d1143e6dc6bbf3797dbaae42d4bfce3dea5d88;hp=566cf8896b3988553b9457be1996a455d252d064;hpb=c51e8844f19c31b2809ba459a1659d3b94a86f89;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 566cf88..5e918c8 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -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()); } } @@ -138,7 +138,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 +171,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 +184,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) @@ -214,7 +214,7 @@ void Component::create_targets() const 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); + Tool *tool = toolchain.get_tool_for_suffix(ext, true); if(tool) { Target *src = tool->create_source(*this, *i); @@ -232,12 +232,12 @@ void Component::create_targets() const } } - 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)); } @@ -348,6 +348,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)