X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=4e7f547f36f7d05b9212a09f957907e1c79c75a8;hb=45571f0fffaf483d07d92f56ae20f00218b7463c;hp=5f50a6525b349eb921a04648cfd7bc44ad224384;hpb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 5f50a65..4e7f547 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -4,6 +4,7 @@
 #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"
@@ -89,15 +90,6 @@ void Component::create_build_info()
 	if(type==LIBRARY || type==MODULE)
 		if(build_info.libmode<BuildInfo::DYNAMIC)
 			build_info.libmode = BuildInfo::DYNAMIC;
-
-	if(build_info.libmode<BuildInfo::DYNAMIC)
-	{
-		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());
-		}
-	}
 }
 
 BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
@@ -210,13 +202,28 @@ void Component::create_targets() const
 	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;
 
@@ -226,8 +233,16 @@ void Component::create_targets() const
 					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);
+				}
 			}
 		}
 
@@ -316,7 +331,8 @@ void Component::Loader::build_info()
 
 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)
@@ -325,7 +341,8 @@ void Component::Loader::if_arch(const string &cond)
 
 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)