X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5e918c841719967b99f904c0d3c5fae05aaeb158;hb=e516e78510ad455eebc0e06645c9f12943117525;hp=3b1f872ae92292529b845ab09e9b7b112763fa4f;hpb=d334fc1d04b7f83c7a2e9f16439fec884f4de471;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 3b1f872..5e918c8 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -82,7 +82,7 @@ void Component::create_build_info()
 		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());
 		}
 	}
@@ -101,6 +101,32 @@ void Component::create_build_info()
 	}
 }
 
+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())
+	{
+		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
 {
 	Builder &builder = package.get_builder();
@@ -112,7 +138,7 @@ 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)
@@ -145,7 +171,7 @@ void Component::create_targets() const
 	else if(type==INSTALL)
 	{
 		Target *inst = build_graph.get_target("install");
-		const Tool &copy = toolchain.get_tool("CP");
+		Tool &copy = toolchain.get_tool("CP");
 		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			FileTarget *ft;
@@ -158,7 +184,7 @@ void Component::create_targets() const
 	}
 	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)
@@ -188,7 +214,7 @@ void Component::create_targets() const
 		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);
+			Tool *tool = toolchain.get_tool_for_suffix(ext, true);
 			if(tool)
 			{
 				Target *src = tool->create_source(*this, *i);
@@ -206,12 +232,12 @@ void Component::create_targets() const
 			}
 		}
 
-		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));
 		}
@@ -237,13 +263,32 @@ Component::SourceList Component::collect_source_files() const
 		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;
@@ -255,6 +300,7 @@ Component::Loader::Loader(Component &c):
 {
 	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);
@@ -292,11 +338,18 @@ void Component::Loader::install_map()
 	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)