X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=9f0bfcd2e5aa273fd11fc878ec1bfe4c8d9a22a3;hb=d9028dec3b81c84560c580008fa68490f049e723;hp=6fd6161989f24450ca4352b60126f474d545f366;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 6fd6161..9f0bfcd 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
@@ -7,6 +8,7 @@
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -16,10 +18,11 @@ Binary::Binary(Builder &b, const FS::Path &p):
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p)
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
+	objects(objs)
 {
 	component = &c;
-	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
 		add_dependency(**i);
 }
 
@@ -28,8 +31,6 @@ void Binary::find_dependencies()
 	if(!component)
 		return;
 
-	BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
-
 	list<const Component *> queue;
 	list<Target *> dep_libs;
 	queue.push_back(component);
@@ -41,15 +42,19 @@ void Binary::find_dependencies()
 		const BuildInfo &binfo = c->get_build_info();
 		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
+			BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
 			Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
 			if(lib)
 			{
-				dep_libs.push_back(lib);
-
-				lib = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
+				Target *real = lib->get_real_target();
+				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+				{
+					dep_libs.push_back(stlib);
 					if(stlib->get_component())
 						queue.push_back(stlib->get_component());
+				}
+				else
+					dep_libs.push_back(lib);
 			}
 			else
 				builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
@@ -67,3 +72,18 @@ 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;
+	sigs.push_back(tool->create_build_signature(component->get_build_info()));
+	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();
+
+	return join(sigs.begin(), sigs.end(), ";");
+}