X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flib%2Fcomponent.cpp;h=1ba258bd70a00f4011587bd3617ccff24796a7ce;hb=6ce67e1469bf62156ddf64e33644851f9064c6ed;hp=2763909a441f5f7053997f1e4cb641505fee9106;hpb=c5d6d6d6d76189b9b2937295709b85654780e9db;p=builder.git

diff --git a/source/lib/component.cpp b/source/lib/component.cpp
index 2763909..1ba258b 100644
--- a/source/lib/component.cpp
+++ b/source/lib/component.cpp
@@ -14,12 +14,27 @@ using namespace Msp;
 
 void Component::prepare()
 {
-	for(Package *r: requires)
+	for(Package *r: required_pkgs)
 	{
 		r->prepare();
 		broken |= r->is_broken();
 	}
 
+	if(!sources.empty())
+	{
+		for(auto i=sources.begin(); i!=sources.end(); ++i)
+		{
+			FS::Path s = *i;
+			if(!FS::is_dir(s))
+				s = FS::dirname(s);
+
+			if(i==sources.begin())
+				source_base_path = s;
+			else
+				source_base_path = FS::common_ancestor(source_base_path, s);
+		}
+	}
+
 	if(!problems.empty())
 		broken = true;
 }
@@ -27,10 +42,14 @@ void Component::prepare()
 void Component::create_build_info()
 {
 	BuildInfo final_build_info;
-	final_build_info.defines[toupper(name)+"_BUILD"] = "1";
+	string build_macro = toupper(name)+"_BUILD";
+	for(char &c: build_macro)
+		if(!isalnum(static_cast<unsigned char>(c)))
+			c = '_';
+	final_build_info.defines[build_macro] = "1";
 
 	const Package::Requirements &pkg_reqs = package.get_required_packages();
-	Package::Requirements direct_reqs = requires;
+	Package::Requirements direct_reqs = required_pkgs;
 	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 	for(Package *r: direct_reqs)
 		final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY);
@@ -61,23 +80,33 @@ void Component::create_build_info()
 		p = (package.get_source_directory()/p).str();
 }
 
+FS::Path Component::get_temp_directory() const
+{
+	return package.get_temp_directory()/name;
+}
+
+string Component::flatten_source_path(const FS::Path &source) const
+{
+	FS::Path temp_dir = get_temp_directory();
+	FS::Path rel_src;
+	if(FS::descendant_depth(source, temp_dir)>=0)
+		rel_src = FS::relative(source, temp_dir);
+	else
+		rel_src = FS::relative(source, source_base_path);
+
+	string fn;
+	for(const string &c: rel_src)
+		if(c!=".")
+			append(fn, "_", c);
+
+	return fn;
+}
+
 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);
@@ -177,7 +206,7 @@ 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);
+		obj.required_pkgs.push_back(req);
 	else
 		obj.problems.push_back(format("Required package %s not found", n));
 }