X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=d0cc1e9822922726f5a5cce8f2af3c5fa0a7b7af;hb=9e28243c9687608ec3c32954b4031490296ae877;hp=566cf8896b3988553b9457be1996a455d252d064;hpb=c51e8844f19c31b2809ba459a1659d3b94a86f89;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 566cf88..d0cc1e9 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)); }