X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=98b6ff76590e1067709895ed1277d6535ed61e58;hb=3938f8030b1f62802decce19777ce70fdafaff10;hp=bebe3f7790f4c6b20d874a6208e40583f2d6f083;hpb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index bebe3f7..98b6ff7 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -19,8 +19,8 @@ Component::Component(SourcePackage &p, const string &n):
 
 void Component::prepare()
 {
-	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->prepare();
+	for(Package *r: requires)
+		r->prepare();
 }
 
 void Component::create_build_info()
@@ -32,94 +32,101 @@ void Component::create_build_info()
 	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 
 	Package::Requirements all_reqs = direct_reqs;
-	for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	for(Package *r: all_reqs)
 	{
 		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
-		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
+		if(any_equals(direct_reqs, r))
 			level = BuildInfo::DEPENDENCY;
-		final_build_info.update_from((*i)->get_exported_build_info(), level);
+		final_build_info.update_from(r->get_exported_build_info(), level);
 
-		const Package::Requirements &reqs = (*i)->get_required_packages();
-		for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-			if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
-				all_reqs.push_back(*j);
+		for(Package *q: r->get_required_packages())
+			if(!any_equals(all_reqs, q))
+				all_reqs.push_back(q);
 	}
 
 	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();
+	for(FS::Path &p: build_info.incpath)
+		p = (package.get_source_directory()/p).str();
+	for(FS::Path &p: build_info.libpath)
+		p = (package.get_source_directory()/p).str();
 }
 
 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);
 		string last = FS::basename(dir);
-		for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
-			if(last==*i)
-			{
-				dir = FS::dirname(dir);
-				break;
-			}
+		if(any_equals(overlays, last))
+			dir = FS::dirname(dir);
 
-		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);
-			}
+		if(any_equals(sources, dir))
+		{
+			binfo.local_incpath.push_back(dir);
+			for(const string &o: overlays)
+				binfo.local_incpath.push_back(dir/o);
+		}
 	}
 	return binfo;
 }
 
-Component::SourceList Component::collect_source_files() const
+list<FS::Path> Component::collect_source_files() const
 {
-	SourceList files;
-	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	list<FS::Path> files;
+	for(const FS::Path &p: sources)
 	{
-		FS::Path path(*i);
-		if(FS::is_dir(path))
+		if(FS::is_dir(p))
 		{
-			SourceList dirs;
-			dirs.push_back(path);
-			for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+			list<FS::Path> dirs;
+			dirs.push_back(p);
+			for(const string &o: overlays)
 			{
-				FS::Path opath = path / *j;
+				FS::Path opath = p/o;
 				if(FS::is_dir(opath))
 					dirs.push_back(opath);
 			}
 			set<string> overlay_files;
-			for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
+			for(auto 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)
+				for(const string &f: list_files(*j))
 				{
 					if(j!=dirs.begin())
 					{
-						if(overlay_files.count(*k))
+						if(overlay_files.count(f))
 							continue;
-						overlay_files.insert(*k);
+						overlay_files.insert(f);
 					}
-					files.push_back(*j / *k);
+					FS::Path fn = *j/f;
+					if(!FS::is_dir(fn))
+						files.push_back(fn);
 				}
 			}
 		}
 		else
 		{
-			files.push_back(path);
-			for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+			files.push_back(p);
+			for(const string &o: overlays)
 			{
-				FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+				FS::Path opath = FS::dirname(p)/o/FS::basename(p);
 				if(FS::is_reg(opath))
 					files.push_back(opath);
 			}