X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=fcf30f1d1fca03170f868ac7423ced7d37605683;hb=HEAD;hp=c8011d7c2a24c0cec015d751fca615fc8df23de4;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
deleted file mode 100644
index c8011d7..0000000
--- a/source/binary.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <algorithm>
-#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 "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 FS::Path &p):
-	FileTarget(b, p)
-{ }
-
-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(ObjectFile *o: objects)
-		add_dependency(*o);
-
-	nested_build_sig = true;
-	arch_in_build_sig = true;
-}
-
-void Binary::collect_build_info(BuildInfo &binfo) const
-{
-	for(ObjectFile *o: objects)
-		if(const Tool *obj_tool = o->get_tool())
-			binfo.update_from(obj_tool->get_build_info());
-
-	Target::collect_build_info(binfo);
-
-	binfo.update_from(static_binfo);
-}
-
-void Binary::find_dependencies()
-{
-	if(!component)
-		return;
-
-	list<Target *> queue;
-	list<Target *> dep_libs;
-	set<string> missing_libs;
-	queue.push_back(this);
-	for(auto j=queue.begin(); j!=queue.end(); ++j)
-	{
-		Target *tgt = *j;
-
-		BuildInfo binfo;
-		tgt->collect_build_info(binfo);
-		if(tgt!=this)
-		{
-			static_binfo.libpath.insert(static_binfo.libpath.end(), binfo.libpath.begin(), binfo.libpath.end());
-			static_binfo.keep_symbols.insert(static_binfo.keep_symbols.end(), binfo.keep_symbols.begin(), binfo.keep_symbols.end());
-			if(binfo.threads)
-				static_binfo.threads = true;
-		}
-
-		auto insert_pos = j;
-		++insert_pos;
-		for(const string &l: binfo.libs)
-		{
-			if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
-				continue;
-
-			BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(l);
-			Target *lib = builder.get_vfs().find_library(l, binfo.libpath, libmode);
-			if(lib)
-			{
-				Target *real = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-					queue.insert(insert_pos, stlib);
-				else
-					dep_libs.push_back(lib);
-			}
-			else if(missing_libs.insert(l).second)
-				problems.push_back(format("Required library %s not found", l));
-		}
-	}
-
-	queue.pop_front();
-	dep_libs.splice(dep_libs.begin(), queue);
-
-	/* Add only the last occurrence of each library to the actual dependencies.
-	This ensures that static library ordering is correct. */
-	for(auto i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-		if(!any_of(next(i), dep_libs.end(), [i](Target *d){ return d==*i; }))
-			add_dependency(**i);
-}