X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=68c9b1800097ad6ef014ae5b5a86122e52d392cf;hb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;hp=4a889cb1750903209638a2cb2b8d8b3945847793;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 4a889cb..68c9b18 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -68,6 +68,25 @@ 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);
+		build_info.libs.push_back((*i)->get_name());
+		if(!(*i)->get_install())
+		{
+		    build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+			build_info.libpath.push_back((*i)->get_package().get_source_directory());
+		}
+	}
+
 	if(type==LIBRARY || type==MODULE)
 		if(build_info.libmode<BuildInfo::DYNAMIC)
 			build_info.libmode = BuildInfo::DYNAMIC;
@@ -88,7 +107,6 @@ void Component::create_targets() const
 	const Toolchain &toolchain = builder.get_toolchain();
 
 	SourceList source_filenames = collect_source_files();
-	list<Target *> inst_list;
 
 	string inst_loc;
 	if(type==TARBALL)
@@ -125,7 +143,8 @@ void Component::create_targets() const
 	}
 	else if(type==INSTALL)
 	{
-		inst_loc = name;
+		Target *inst = builder.get_target("install");
+		const Tool &copy = toolchain.get_tool("CP");
 		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			FileTarget *ft;
@@ -133,7 +152,7 @@ void Component::create_targets() const
 				ft = dynamic_cast<FileTarget *>(tgt);
 			else
 				ft = new File(builder, package, *i);
-			inst_list.push_back(ft);
+			inst->add_dependency(*copy.create_target(*ft, name));
 		}
 	}
 	else if(type==DATAFILE)
@@ -149,7 +168,7 @@ void Component::create_targets() const
 
 		builder.add_primary_target(*result);
 		if(install)
-			inst_list.push_back(result);
+			builder.add_installed_target(*result);
 	}
 
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
@@ -172,7 +191,7 @@ void Component::create_targets() const
 				}
 
 				if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-					inst_list.push_back(src);
+					builder.add_installed_target(*src);
 			}
 		}
 
@@ -194,17 +213,9 @@ void Component::create_targets() const
 		{
 			builder.add_primary_target(**i);
 			if(install)
-				inst_list.push_back(*i);
+				builder.add_installed_target(**i);
 		}
 	}
-
-	Target *inst_tgt = builder.get_target("install");
-	const Tool &copy = toolchain.get_tool("CP");
-	for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-	{
-		Target *inst = copy.create_target(**i, inst_loc);
-		inst_tgt->add_dependency(*inst);
-	}
 }
 
 Component::SourceList Component::collect_source_files() const
@@ -237,6 +248,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 +272,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;
+		}
+	throw invalid_argument("Component::Loader::use");
+}