X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=8a57b6410ee47024cec0b88704f9998707130a4b;hb=7c61a1e64153bac91431e1a72d946208dd61eb30;hp=4a889cb1750903209638a2cb2b8d8b3945847793;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 4a889cb..8a57b64 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -68,6 +68,19 @@ void Component::create_build_info()
 	final_build_info.update_from(build_info);
 	build_info = final_build_info;
 
+	for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
+	{
+		/* Select an include path that contains all the sources for this and the
+		used component.  This should produce a sensible result in most cases. */
+		FS::Path base;
+		for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
+			base = base.empty() ? *j : FS::common_ancestor(base, *j);
+		const SourceList &use_sources = (*i)->get_sources();
+		for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
+			base = FS::common_ancestor(base, *j);
+		build_info.incpath.push_back(base);
+	}
+
 	if(type==LIBRARY || type==MODULE)
 		if(build_info.libmode<BuildInfo::DYNAMIC)
 			build_info.libmode = BuildInfo::DYNAMIC;
@@ -190,6 +203,24 @@ void Component::create_targets() const
 		else
 			results.push_back(linker.create_target(objs));
 
+		const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies();
+		for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
+		{
+			/* The world target depends on all primary targets; look for the
+			static library belonging to the component.  This is a bit roundabout
+			way but gets the job done. */
+			bool found = false;
+			for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j)
+				if((*j)->get_component()==*i && dynamic_cast<StaticLibrary *>(*j))
+				{
+					results.front()->add_dependency(**j);
+					found = true;
+					break;
+				}
+			if(!found)
+				builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name));
+		}
+
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
 			builder.add_primary_target(**i);
@@ -237,6 +268,7 @@ Component::Loader::Loader(Component &c):
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
 	add("default",         &Component::deflt);
+	add("use",             &Loader::use);
 }
 
 void Component::Loader::source(const string &s)
@@ -260,3 +292,15 @@ void Component::Loader::install_map()
 {
 	load_sub(obj.install_map, obj.package.get_source_directory());
 }
+
+void Component::Loader::use(const string &n)
+{
+	const SourcePackage::ComponentList &components = obj.package.get_components();
+	for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+		if(i->get_name()==n && i->get_type()==LIBRARY)
+		{
+			obj.uses.push_back(&*i);
+			return;
+		}
+	error(format("Unknown library component '%s'", n));
+}