#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
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));
+ 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);
+ }
}
}
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)
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)