X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=957d233d65ec3bff179d3e93703b5f5af1c57e7e;hb=19a821ee581f0fe60860627472cc59065247bf13;hp=b3f018488347fc090d57839a0a0cc7344eaf40e2;hpb=16bda19cc87b5064daad9955f0ebb5ac5be7dec7;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index b3f0184..957d233 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -3,7 +3,6 @@
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "link.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -12,31 +11,39 @@
 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)
+Binary::Binary(Builder &b, const FS::Path &p):
+	FileTarget(b, 0, p)
+{ }
+
+Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<ObjectFile *> &objs):
+	FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p)
 {
+	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_depend(*i);
 }
 
 void Binary::find_depends()
 {
-	LibMode libmode = comp.get_package().get_library_mode();
+	if(!component)
+		return;
+
+	const SourcePackage &spkg = component->get_package();
+	LibMode libmode = spkg.get_library_mode();
 	if(dynamic_cast<SharedLibrary *>(this))
 		libmode = DYNAMIC;
 
 	list<const Component *> queue;
 	list<Target *> dep_libs;
-	queue.push_back(&comp);
+	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 BuildInfo::PathList &libpath = c->get_build_info().libpath;
 
-		const list<string> &libs = c->get_build_info().libs;
+		const BuildInfo::WordList &libs = c->get_build_info().libs;
 		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
 		{
 			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
@@ -46,10 +53,10 @@ void Binary::find_depends()
 
 				lib = lib->get_real_target();
 				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
-					queue.push_back(&stlib->get_component());
+					queue.push_back(stlib->get_component());
 			}
 			else
-				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
+				builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
 		}
 	}
 
@@ -63,31 +70,4 @@ void Binary::find_depends()
 		if(last)
 			add_depend(*i);
 	}
-
-	deps_ready = true;
-}
-
-FS::Path Binary::generate_target_path(const Component &c)
-{
-	const SourcePackage &pkg = c.get_package();
-	string prefix, suffix;
-	const string &sys = pkg.get_builder().get_current_arch().get_system();
-
-	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";
-	}
-
-	return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
 }