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

diff --git a/source/component.cpp b/source/component.cpp
index f5ca812..93d450b 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -66,7 +66,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 +78,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 +124,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,9 +153,9 @@ 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);
 	}
@@ -197,9 +198,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);
 		}
@@ -210,7 +211,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);
 	}
 }
 
@@ -222,6 +223,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);
@@ -235,7 +237,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);
@@ -247,22 +249,22 @@ Component::Loader::Loader(Component &c):
 
 void Component::Loader::source(const string &s)
 {
-	comp.sources.push_back(s);
+	obj.sources.push_back(s);
 }
 
 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());
 }