X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=f5ca812169c3d4b4910289c4bf97a8d1962fd502;hb=75ac80cb255e4def7ee685ce9c46db7c2f6625aa;hp=a340f3cc28b00efb091341ad6e3a593f9375e071;hpb=b1f8964a6b466f9b0c86e82706bf9e72133ecfcf;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index a340f3c..f5ca812 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -6,12 +6,12 @@
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
+#include "csourcefile.h"
 #include "datafile.h"
 #include "executable.h"
 #include "file.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
-#include "sourcefile.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
 #include "tarball.h"
@@ -61,9 +61,9 @@ void Component::create_build_info()
 
 	build_info.update_from(pkg.get_build_info());
 
-	for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
-	for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
 
 	if(pkg.get_library_mode()!=DYNAMIC)
@@ -77,8 +77,6 @@ void Component::create_build_info()
 
 	if(type==PROGRAM)
 		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
-
-	build_info.unique();
 }
 
 void Component::create_targets() const
@@ -160,23 +158,6 @@ void Component::create_targets() const
 		if(install)
 			inst_list.push_back(result);
 	}
-	else
-	{
-		for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-		{
-			string ext = FS::extpart(FS::basename(*i));
-			if(ext==".h")
-			{
-				FileTarget *hdr = builder.get_vfs().get_target(*i);
-				if(!hdr)
-					hdr = new SourceFile(builder, *this, *i);
-
-				// Install headers if requested
-				if(type==HEADERS && install)
-					inst_list.push_back(hdr);
-			}
-		}
-	}
 
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
 	{
@@ -184,12 +165,18 @@ void Component::create_targets() const
 		for(PathList::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);
+			const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
 			if(tool)
 			{
 				Target *src = tool->create_source(*this, *i);
-				Target *obj = tool->create_target(*src);
-				objs.push_back(obj);
+				if(tool->accepts_suffix(ext))
+				{
+					Target *obj = tool->create_target(*src);
+					objs.push_back(obj);
+				}
+
+				if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
+					inst_list.push_back(src);
 			}
 		}
 
@@ -252,22 +239,12 @@ Component::Loader::Loader(Component &c):
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
+	add("install_map",     &Loader::install_map);
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
 	add("default",         &Component::deflt);
 }
 
-void Component::Loader::finish()
-{
-	if(!inst_hdr.empty())
-	{
-		Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
-		hdrcomp.sources = comp.sources;
-		hdrcomp.install = true;
-		const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
-	}
-}
-
 void Component::Loader::source(const string &s)
 {
 	comp.sources.push_back(s);
@@ -275,7 +252,7 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-	Package *req = comp.pkg.get_builder().get_package(n);
+	Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
 	if(req)
 		comp.requires.push_back(req);
 }
@@ -284,3 +261,8 @@ void Component::Loader::build_info()
 {
 	load_sub(comp.build_info);
 }
+
+void Component::Loader::install_map()
+{
+	load_sub(comp.install_map, comp.pkg.get_source());
+}