X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=f3654f42f906767d2a41464117f3e2a52ceccb9b;hb=45571f0fffaf483d07d92f56ae20f00218b7463c;hp=a3f3c9b4ec71dd4c70439b1150fcb2cd996a8366;hpb=43d1143e6dc6bbf3797dbaae42d4bfce3dea5d88;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index a3f3c9b..f3654f4 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -24,6 +24,20 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
 	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
 		add_dependency(**i);
+
+	nested_build_sig = true;
+	arch_in_build_sig = true;
+}
+
+void Binary::collect_build_info(BuildInfo &binfo) const
+{
+	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		if(const Tool *obj_tool = (*i)->get_tool())
+			binfo.update_from(obj_tool->get_build_info());
+
+	Target::collect_build_info(binfo);
+
+	binfo.update_from(static_binfo);
 }
 
 void Binary::find_dependencies()
@@ -31,18 +45,25 @@ void Binary::find_dependencies()
 	if(!component)
 		return;
 
-	list<const Component *> queue;
+	list<Target *> queue;
 	list<Target *> dep_libs;
 	set<string> missing_libs;
-	queue.push_back(component);
+	queue.push_back(this);
 	while(!queue.empty())
 	{
-		const Component *c = queue.front();
-		queue.erase(queue.begin());
+		Target *tgt = queue.front();
+		queue.pop_front();
+
+		BuildInfo binfo;
+		tgt->collect_build_info(binfo);
+		if(tgt!=this)
+			static_binfo.libpath.insert(static_binfo.libpath.end(), binfo.libpath.begin(), binfo.libpath.end());
 
-		const BuildInfo &binfo = c->get_build_info();
 		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
+			if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+				continue;
+
 			BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
 			Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
 			if(lib)
@@ -51,8 +72,7 @@ void Binary::find_dependencies()
 				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
 				{
 					dep_libs.push_back(stlib);
-					if(stlib->get_component())
-						queue.push_back(stlib->get_component());
+					queue.push_back(stlib);
 				}
 				else
 					dep_libs.push_back(lib);
@@ -73,20 +93,3 @@ void Binary::find_dependencies()
 			add_dependency(**i);
 	}
 }
-
-string Binary::create_build_signature() const
-{
-	set<const Tool *> object_tools;
-	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		object_tools.insert((*i)->get_tool());
-
-	list<string> sigs;
-	for(set<const Tool *>::const_iterator i=object_tools.begin(); i!=object_tools.end(); ++i)
-		sigs.push_back((*i)->create_build_signature(component->get_build_info()));
-	sigs.sort();
-	sigs.push_front(tool->create_build_signature(component->get_build_info()));
-	if(const Architecture *arch = tool->get_architecture())
-		sigs.push_front(arch->get_name());
-
-	return join(sigs.begin(), sigs.end(), ";");
-}