X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5104cdf3e92b04c8567304baae993bf974f9952c;hb=50baabc242633d531d3f9542e9a64491b6e12c6c;hp=9ffbbf398feb11d7ec5c6f83c54ff9c046a69c30;hpb=0dd3d23846e7fdb729359a57d3f4b190f65aed55;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 9ffbbf3..5104cdf 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -80,7 +80,11 @@ void Component::create_build_info()
 			base = FS::common_ancestor(base, *j);
 		build_info.incpath.push_back(base);
 		build_info.libs.push_back((*i)->get_name());
-		build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+		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)
@@ -100,6 +104,7 @@ void Component::create_build_info()
 void Component::create_targets() const
 {
 	Builder &builder = package.get_builder();
+	BuildGraph &build_graph = builder.get_build_graph();
 	const Toolchain &toolchain = builder.get_toolchain();
 
 	SourceList source_filenames = collect_source_files();
@@ -124,8 +129,8 @@ void Component::create_targets() const
 			tarname = package.get_name()+"-"+package.get_version();
 			files.insert(files.begin(), &package.get_build_file());
 
-			const Builder::TargetMap &targets = builder.get_targets();
-			for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+			const BuildGraph::TargetMap &targets = build_graph.get_targets();
+			for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
 				if(i->second->get_package()==&package && !i->second->is_buildable())
 					if(find(files.begin(), files.end(), i->second)==files.end())
 						files.push_back(i->second);
@@ -133,13 +138,13 @@ void Component::create_targets() const
 
 		Target *result = tar.create_target(files, tarname);
 
-		builder.get_target("tarballs")->add_dependency(*result);
+		build_graph.get_target("tarballs")->add_dependency(*result);
 
 		return;
 	}
 	else if(type==INSTALL)
 	{
-		Target *inst = builder.get_target("install");
+		Target *inst = build_graph.get_target("install");
 		const Tool &copy = toolchain.get_tool("CP");
 		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
@@ -162,9 +167,9 @@ void Component::create_targets() const
 			source = new File(builder, package, source_filenames.front());
 		Target *result = dcomp.create_target(*source);
 
-		builder.add_primary_target(*result);
+		build_graph.add_primary_target(*result);
 		if(install)
-			builder.add_installed_target(*result);
+			build_graph.add_installed_target(*result);
 	}
 
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
@@ -187,7 +192,7 @@ void Component::create_targets() const
 				}
 
 				if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-					builder.add_installed_target(*src);
+					build_graph.add_installed_target(*src);
 			}
 		}
 
@@ -207,9 +212,9 @@ void Component::create_targets() const
 
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
-			builder.add_primary_target(**i);
+			build_graph.add_primary_target(**i);
 			if(install)
-				builder.add_installed_target(**i);
+				build_graph.add_installed_target(**i);
 		}
 	}
 }
@@ -238,6 +243,8 @@ Component::SourceList Component::collect_source_files() const
 Component::Loader::Loader(Component &c):
 	DataFile::ObjectLoader<Component>(c)
 {
+	add("if_arch",         &Loader::if_arch);
+	add("if_feature",      &Loader::if_feature);
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
 	add("install_map",     &Loader::install_map);
@@ -247,6 +254,24 @@ Component::Loader::Loader(Component &c):
 	add("use",             &Loader::use);
 }
 
+void Component::Loader::if_arch(const string &cond)
+{
+	bool match = obj.package.get_builder().get_current_arch().match_name(cond);
+	obj.package.get_builder().get_logger().log("configure",
+		format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
+void Component::Loader::if_feature(const string &cond)
+{
+	bool match = obj.package.match_feature(cond);
+	obj.package.get_builder().get_logger().log("configure",
+		format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
 void Component::Loader::source(const string &s)
 {
 	obj.sources.push_back((obj.package.get_source_directory()/s).str());