X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=2d09f8a0cd007ed12f9e7c09d2a1c78cc4670b47;hb=dc0893c6f6d89fee489a620e0814b4e8a8af9e91;hp=833a0ed20d507b665d59d9022dac7521bdce81d0;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 833a0ed..2d09f8a 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -2,9 +2,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include "booleanevaluator.h"
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcepackage.h"
@@ -61,6 +59,19 @@ 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;
+
+	FS::Path gen_dir = package.get_temp_directory()/"generated";
+	if(FS::descendant_depth(path, gen_dir)>=0)
+	{
+		FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+		binfo.local_incpath.push_back(package.get_source_directory()/subdir);
+	}
+	else
+	{
+		FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+		binfo.local_incpath.push_back(gen_dir/subdir);
+	}
+
 	if(!overlays.empty())
 	{
 		FS::Path dir = FS::dirname(path);
@@ -99,12 +110,23 @@ Component::SourceList Component::collect_source_files() const
 				if(FS::is_dir(opath))
 					dirs.push_back(opath);
 			}
+			set<string> overlay_files;
 			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);
+				vector<string> sfiles = list_files(*j);
+				for(vector<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+				{
+					if(j!=dirs.begin())
+					{
+						if(overlay_files.count(*k))
+							continue;
+						overlay_files.insert(*k);
+					}
+					FS::Path fn = *j / *k;
+					if(!FS::is_dir(fn))
+						files.push_back(fn);
+				}
 			}
 		}
 		else
@@ -124,10 +146,9 @@ Component::SourceList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-	DataFile::ObjectLoader<Component>(c)
+	DataFile::ObjectLoader<Component>(c),
+	ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
 {
-	add("if_arch",         &Loader::if_arch);
-	add("if_feature",      &Loader::if_feature);
 	add("overlay",         &Loader::overlay);
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
@@ -142,26 +163,6 @@ void Component::Loader::build_info()
 	load_sub(obj.build_info);
 }
 
-void Component::Loader::if_arch(const string &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)
-		load_sub_with(*this);
-}
-
-void Component::Loader::if_feature(const string &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_with(*this);
-}
-
 void Component::Loader::install_map()
 {
 	load_sub(obj.install_map, obj.package.get_source_directory());