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

diff --git a/source/component.cpp b/source/component.cpp
index e0630e6..98b6ff7 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -1,36 +1,180 @@
+#include <msp/core/algorithm.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
+#include "builder.h"
 #include "component.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
+using namespace Msp;
 
-Component::Component(Package &p, Type t, const string &n):
-	pkg(p),
-	type(t),
+Component::Component(SourcePackage &p, const string &n):
+	package(p),
 	name(n),
-	install(false)
+	install(false),
+	deflt(true)
 { }
 
+void Component::prepare()
+{
+	for(Package *r: requires)
+		r->prepare();
+}
+
 void Component::create_build_info()
 {
-	build_info.add(pkg.get_build_info());
-	build_info.unique();
+	BuildInfo final_build_info;
+
+	const Package::Requirements &pkg_reqs = package.get_required_packages();
+	Package::Requirements direct_reqs = requires;
+	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
+
+	Package::Requirements all_reqs = direct_reqs;
+	for(Package *r: all_reqs)
+	{
+		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
+		if(any_equals(direct_reqs, r))
+			level = BuildInfo::DEPENDENCY;
+		final_build_info.update_from(r->get_exported_build_info(), level);
+
+		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(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);
+		if(any_equals(overlays, last))
+			dir = FS::dirname(dir);
+
+		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;
+}
+
+list<FS::Path> Component::collect_source_files() const
+{
+	list<FS::Path> files;
+	for(const FS::Path &p: sources)
+	{
+		if(FS::is_dir(p))
+		{
+			list<FS::Path> dirs;
+			dirs.push_back(p);
+			for(const string &o: overlays)
+			{
+				FS::Path opath = p/o;
+				if(FS::is_dir(opath))
+					dirs.push_back(opath);
+			}
+			set<string> overlay_files;
+			for(auto j=dirs.begin(); j!=dirs.end(); ++j)
+			{
+				package.get_builder().get_logger().log("files", format("Traversing %s", *j));
+				for(const string &f: list_files(*j))
+				{
+					if(j!=dirs.begin())
+					{
+						if(overlay_files.count(f))
+							continue;
+						overlay_files.insert(f);
+					}
+					FS::Path fn = *j/f;
+					if(!FS::is_dir(fn))
+						files.push_back(fn);
+				}
+			}
+		}
+		else
+		{
+			files.push_back(p);
+			for(const string &o: overlays)
+			{
+				FS::Path opath = FS::dirname(p)/o/FS::basename(p);
+				if(FS::is_reg(opath))
+					files.push_back(opath);
+			}
+		}
+	}
+
+	return files;
 }
 
+
 Component::Loader::Loader(Component &c):
-	comp(c)
+	DataFile::ObjectLoader<Component>(c),
+	ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
 {
+	add("overlay",         &Loader::overlay);
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
-	add("install_headers", &Component::install_headers);
+	add("install_map",     &Loader::install_map);
 	add("build_info",      &Loader::build_info);
+	add("require",         &Loader::require);
+	add("default",         &Component::deflt);
 }
 
-void Component::Loader::source(const string &s)
+void Component::Loader::build_info()
 {
-	comp.sources.push_back(comp.pkg.get_source()/s);
+	load_sub(obj.build_info);
 }
 
-void Component::Loader::build_info()
+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)
 {
-	load_sub(comp.build_info);
+	obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }