build_info.update_from(pkg.get_build_info());
- for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+ for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
*i = (pkg.get_source() / *i).str();
- for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+ for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (pkg.get_source() / *i).str();
if(pkg.get_library_mode()!=DYNAMIC)
if(install)
inst_list.push_back(result);
}
- else
- {
- for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- string ext = FS::extpart(FS::basename(*i));
- if(ext==".h")
- {
- FileTarget *hdr = builder.get_vfs().get_target(*i);
- if(!hdr)
- hdr = new CSourceFile(builder, *this, *i);
-
- // Install headers if requested
- if(type==HEADERS && install)
- inst_list.push_back(hdr);
- }
- }
- }
if(type==PROGRAM || type==LIBRARY || type==MODULE)
{
for(PathList::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);
+ const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
if(tool)
{
Target *src = tool->create_source(*this, *i);
- Target *obj = tool->create_target(*src);
- objs.push_back(obj);
+ if(tool->accepts_suffix(ext))
+ {
+ Target *obj = tool->create_target(*src);
+ objs.push_back(obj);
+ }
+
+ if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
+ inst_list.push_back(src);
}
}
Component::Loader::Loader(Component &c):
- comp(c)
+ DataFile::ObjectLoader<Component>(c)
{
add("source", &Loader::source);
add("install", &Component::install);
+ add("install_map", &Loader::install_map);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
add("default", &Component::deflt);
}
-void Component::Loader::finish()
-{
- if(!inst_hdr.empty())
- {
- Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
- hdrcomp.sources = comp.sources;
- hdrcomp.install = true;
- const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
- }
-}
-
void Component::Loader::source(const string &s)
{
- comp.sources.push_back(s);
+ obj.sources.push_back(s);
}
void Component::Loader::require(const string &n)
{
- Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
+ Package *req = obj.pkg.get_builder().get_package_manager().find_package(n);
if(req)
- comp.requires.push_back(req);
+ obj.requires.push_back(req);
}
void Component::Loader::build_info()
{
- load_sub(comp.build_info);
+ load_sub(obj.build_info);
+}
+
+void Component::Loader::install_map()
+{
+ load_sub(obj.install_map, obj.pkg.get_source());
}