#include <msp/fs/utils.h>
#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
+#include "booleanevaluator.h"
#include "builder.h"
#include "component.h"
#include "csourcefile.h"
}
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
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());
}
}
if(type==LIBRARY || type==MODULE)
if(build_info.libmode<BuildInfo::DYNAMIC)
build_info.libmode = BuildInfo::DYNAMIC;
+}
- if(build_info.libmode<BuildInfo::DYNAMIC)
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
+{
+ // XXX Cache these and check that the directories actually exist before adding them
+ BuildInfo binfo = build_info;
+ if(!overlays.empty())
{
- for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- {
- const BuildInfo &ebi = (*i)->get_exported_build_info();
- build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
- }
+ FS::Path dir = FS::dirname(path);
+ string last = FS::basename(dir);
+ for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
+ if(last==*i)
+ {
+ dir = FS::dirname(dir);
+ break;
+ }
+
+ for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+ if(dir==*i)
+ {
+ binfo.local_incpath.push_back(dir);
+ for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ binfo.local_incpath.push_back(*i/ *j);
+ }
}
+ return binfo;
}
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<Target *> files;
for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
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;
}
else if(type==DATAPACK)
{
- const Tool &dcomp = toolchain.get_tool("DATA");
+ Tool &dcomp = toolchain.get_tool("DATA");
list<Target *> files;
for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
if(type==PROGRAM || type==LIBRARY || type==MODULE)
{
list<Target *> 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<FileTarget &>(*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;
objs.push_back(obj);
}
- if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
- build_graph.add_installed_target(*src);
+ if(type==LIBRARY && install)
+ {
+ if(dynamic_cast<FileTarget *>(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<FileTarget *>(*j)->is_installable())
+ build_graph.add_installed_target(**j);
+ }
}
}
- const Tool &linker = toolchain.get_tool("LINK");
+ Tool &linker = toolchain.get_tool("LINK");
list<Target *> 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));
}
FS::Path path(*i);
if(FS::is_dir(path))
{
- package.get_builder().get_logger().log("files", format("Traversing %s", path));
- list<string> sfiles = list_files(path);
- for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
- files.push_back(path / *j);
+ SourceList dirs;
+ dirs.push_back(path);
+ for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ {
+ FS::Path opath = path / *j;
+ if(FS::is_dir(opath))
+ dirs.push_back(opath);
+ }
+ for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+ {
+ package.get_builder().get_logger().log("files", format("Traversing %s", *j));
+ list<string> sfiles = list_files(*j);
+ for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+ files.push_back(*j / *k);
+ }
}
else
+ {
files.push_back(path);
+ for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ {
+ FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+ if(FS::is_reg(opath))
+ files.push_back(opath);
+ }
+ }
}
return files;
{
add("if_arch", &Loader::if_arch);
add("if_feature", &Loader::if_feature);
+ add("overlay", &Loader::overlay);
add("source", &Loader::source);
add("install", &Component::install);
add("install_map", &Loader::install_map);
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)
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)
load_sub(obj.install_map, obj.package.get_source_directory());
}
+void Component::Loader::overlay(const string &o)
+{
+ obj.overlays.push_back(o);
+}
+
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)
projects / builder.git / blobdiff