X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=3f8b004ce172af9a96b36ee6af13d7a586c6de75;hb=9134ce7f2225eb301c7b6c9aca8521c4e82dc065;hp=902cf49abfe6d1142d0d4c50819a7cc103e0edaa;hpb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 902cf49..3f8b004 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -30,13 +30,10 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 	deflt(true)
 { }
 
-void Component::configure(const StringMap &opts, unsigned flag)
+void Component::prepare()
 {
-	for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i)
-		*i = (pkg.get_source()/pkg.expand_string(*i)).str();
-
 	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
+		(*i)->prepare();
 }
 
 void Component::create_build_info()
@@ -66,7 +63,11 @@ void Component::create_build_info()
 	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)
+	if(type==LIBRARY || type==MODULE)
+		if(build_info.libmode<BuildInfo::DYNAMIC)
+			build_info.libmode = BuildInfo::DYNAMIC;
+
+	if(build_info.libmode<BuildInfo::DYNAMIC)
 	{
 		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 		{
@@ -74,9 +75,6 @@ void Component::create_build_info()
 			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
 		}
 	}
-
-	if(type==PROGRAM)
-		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
 }
 
 void Component::create_targets() const
@@ -123,7 +121,7 @@ void Component::create_targets() const
 		/*Target *result = tar.create_target(files, tarname);
 
 		Target *tarballs_tgt = builder.get_target("tarballs");
-		tarballs_tgt->add_depend(result);*/
+		tarballs_tgt->add_depend(*result);*/
 
 		return;
 	}
@@ -152,29 +150,12 @@ void Component::create_targets() const
 		Target *result = dcomp.create_target(*source);
 
 		if(&pkg==builder.get_main_package() && deflt)
-			def_tgt->add_depend(result);
+			def_tgt->add_depend(*result);
 		else
-			world->add_depend(result);
+			world->add_depend(*result);
 		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 CSourceFile(builder, *this, *i);
-
-				// Install headers if requested
-				if(type==HEADERS && install)
-					inst_list.push_back(hdr);
-			}
-		}
-	}
 
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
 	{
@@ -182,12 +163,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);
 			}
 		}
 
@@ -208,9 +195,9 @@ void Component::create_targets() const
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
 			if(&pkg==builder.get_main_package() && deflt)
-				def_tgt->add_depend(*i);
+				def_tgt->add_depend(**i);
 			else
-				world->add_depend(*i);
+				world->add_depend(**i);
 			if(install)
 				inst_list.push_back(*i);
 		}
@@ -221,7 +208,7 @@ void Component::create_targets() const
 	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_depend(inst);
+		inst_tgt->add_depend(*inst);
 	}
 }
 
@@ -233,6 +220,7 @@ PathList Component::collect_source_files() const
 		FS::Path path(*i);
 		if(FS::is_dir(path))
 		{
+			pkg.get_builder().get_logger().log("files", format("Traversing %s", path));
 			list<string> sfiles = list_files(path);
 			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
 				files.push_back(path / *j);
@@ -246,7 +234,7 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-	comp(c)
+	DataFile::ObjectLoader<Component>(c)
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
@@ -258,22 +246,22 @@ Component::Loader::Loader(Component &c):
 
 void Component::Loader::source(const string &s)
 {
-	comp.sources.push_back(s);
+	obj.sources.push_back((obj.pkg.get_source()/s).str());
 }
 
 void Component::Loader::require(const string &n)
 {
-	Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
+	Package *req = obj.pkg.get_builder().get_package_manager().find_package(n);
 	if(req)
-		comp.requires.push_back(req);
+		obj.requires.push_back(req);
 }
 
 void Component::Loader::build_info()
 {
-	load_sub(comp.build_info);
+	load_sub(obj.build_info);
 }
 
 void Component::Loader::install_map()
 {
-	load_sub(comp.install_map, comp.pkg.get_source());
+	load_sub(obj.install_map, obj.pkg.get_source());
 }