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

diff --git a/source/binary.cpp b/source/binary.cpp
index b8445c1..a3f3c9b 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,62 +1,64 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "link.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
-Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c)),
-	comp(c)
-{
-	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-		add_depend(*i);
+Binary::Binary(Builder &b, const FS::Path &p):
+	FileTarget(b, p)
+{ }
 
-	if(c.get_type()==Component::LIBRARY)
-		install_location = "lib";
-	else if(c.get_type()==Component::MODULE)
-		install_location = "lib/"+package->get_name();
-	else if(c.get_type()==Component::PROGRAM)
-		install_location = "bin";
+Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
+	objects(objs)
+{
+	component = &c;
+	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		add_dependency(**i);
 }
 
-void Binary::find_depends()
+void Binary::find_dependencies()
 {
-	LibMode libmode = comp.get_package().get_library_mode();
-	if(dynamic_cast<SharedLibrary *>(this))
-		libmode = DYNAMIC;
+	if(!component)
+		return;
 
 	list<const Component *> queue;
 	list<Target *> dep_libs;
-	queue.push_back(&comp);
+	set<string> missing_libs;
+	queue.push_back(component);
 	while(!queue.empty())
 	{
 		const Component *c = queue.front();
 		queue.erase(queue.begin());
 
-		const StringList &libpath = c->get_build_info().libpath;
-
-		const list<string> &libs = c->get_build_info().libs;
-		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+		const BuildInfo &binfo = c->get_build_info();
+		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
-			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
+			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))
-					queue.push_back(&stlib->get_component());
+				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(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
+			else if(missing_libs.insert(*i).second)
+				problems.push_back(format("Required library %s not found", *i));
 		}
 	}
 
@@ -68,33 +70,23 @@ void Binary::find_depends()
 		for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
 			last = (j==i || *j!=*i);
 		if(last)
-			add_depend(*i);
+			add_dependency(**i);
 	}
-
-	deps_ready = true;
 }
 
-FS::Path Binary::generate_target_path(const Component &c)
+string Binary::create_build_signature() const
 {
-	const SourcePackage &pkg = c.get_package();
-	string prefix, suffix;
-	const string &sys = pkg.get_builder().get_current_arch().get_system();
+	set<const Tool *> object_tools;
+	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		object_tools.insert((*i)->get_tool());
 
-	if(c.get_type()==Component::LIBRARY)
-	{
-		prefix = "lib";
-		if(sys=="windows")
-			suffix = ".dll";
-		else
-			suffix = ".so";
-	}
-	else if(c.get_type()==Component::MODULE)
-		suffix = ".m";
-	else if(c.get_type()==Component::PROGRAM)
-	{
-		if(sys=="windows")
-			suffix = ".exe";
-	}
+	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 pkg.get_out_dir()/(prefix+c.get_name()+suffix);
+	return join(sigs.begin(), sigs.end(), ";");
 }