#include <msp/strings/lexicalcast.h>
#include "builder.h"
#include "component.h"
+#include "csourcefile.h"
#include "datafile.h"
#include "executable.h"
#include "file.h"
-#include "header.h"
#include "objectfile.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
PackageList all_reqs = direct_reqs;
for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
+ BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
- build_info.add((*i)->get_exported_binfo());
- else
- {
- const BuildInfo &ebi = (*i)->get_exported_binfo();
- build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
- build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
- build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
- }
+ level = BuildInfo::DEPENDENCY;
+ build_info.update_from((*i)->get_exported_binfo(), level);
const PackageList &reqs = (*i)->get_requires();
for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
all_reqs.push_back(*j);
}
- build_info.add(pkg.get_build_info());
+ 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)
build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
}
}
-
- if(type==PROGRAM)
- {
- string strip = pkg.get_config().get_option("strip").value;
- if(lexical_cast<bool>(strip))
- build_info.ldflags.push_back("-s");
- }
- else if(type==LIBRARY)
- {
- build_info.cflags.push_back("-fPIC");
- }
-
- build_info.unique();
}
void Component::create_targets() const
/*Target *result = tar.create_target(files, tarname);
Target *tarballs_tgt = builder.get_target("tarballs");
- tarballs_tgt->add_depend(result);*/
+ tarballs_tgt->add_depend(*result);*/
return;
}
Target *result = dcomp.create_target(*source);
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(result);
+ def_tgt->add_depend(*result);
else
- world->add_depend(result);
+ world->add_depend(*result);
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 Header(builder, *this, i->str());
-
- // 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);
}
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(*i);
+ def_tgt->add_depend(**i);
else
- world->add_depend(*i);
+ world->add_depend(**i);
if(install)
inst_list.push_back(*i);
}
for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
{
Target *inst = copy.create_target(**i, inst_loc);
- inst_tgt->add_depend(inst);
+ inst_tgt->add_depend(*inst);
}
}
Component::Loader::Loader(Component &c):
- comp(c)
+ DataFile::ObjectLoader<Component>(c)
{
add("source", &Loader::source);
add("install", &Component::install);
- add("install_headers", &Loader::install_headers);
+ add("install_map", &Loader::install_map);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
- add("modular", &Loader::modular);
- add("host", &Loader::host);
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(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::modular()
-{
- IO::print("%s: Note: modular is deprecated\n", get_source());
- comp.build_info.ldflags.push_back("-rdynamic");
- comp.build_info.libs.push_back("dl");
-}
-
-void Component::Loader::host(const string &)
-{
- IO::print("%s: Note: host is deprecated\n", get_source());
-}
-
-void Component::Loader::install_headers(const string &p)
+void Component::Loader::build_info()
{
- IO::print("%s: Note: install_headers is deprecated\n", get_source());
- if(comp.type==HEADERS)
- {
- comp.name = p;
- comp.install = true;
- }
- else
- inst_hdr = p;
+ load_sub(obj.build_info);
}
-void Component::Loader::build_info()
+void Component::Loader::install_map()
{
- load_sub(comp.build_info);
+ load_sub(obj.install_map, obj.pkg.get_source());
}
projects / builder.git / blobdiff