X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=00fa6792859962e9a1a0b984bdde70b8c86bf3e4;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=52c8a81e8de302efe936802fc87d084e8eba4260;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 52c8a81..00fa679 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,8 +1,7 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
@@ -11,65 +10,101 @@ using namespace std;
 using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
-	FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
-	comp(c),
-	source(s)	
+	FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
+	source(s)
 {
-	buildable = true;
-	add_depend(&source);
+	component = &c;
+	add_dependency(source);
 }
 
-void ObjectFile::find_depends()
+FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
-	for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+	const SourcePackage &pkg = comp.get_package();
+	FS::Path temp_dir = pkg.get_temp_directory();
+	FS::Path rel_src;
+	if(FS::descendant_depth(src, temp_dir)>=0)
+		rel_src = FS::relative(src, temp_dir);
+	else
+		rel_src = FS::relative(src, pkg.get_source_directory());
+	string fn;
+	for(const string &c: rel_src)
 	{
-		Target *tgt = *i;
-		if(tgt->get_depends_ready())
-		{
-			i = new_deps.erase(i);
-			find_depends(tgt);
-		}
-		else
-			++i;
+		if(!fn.empty())
+			fn += '_';
+		if(c!=".")
+			fn += c;
 	}
-
-	deps_ready = new_deps.empty();
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return temp_dir/comp.get_name()/arch.create_filename<ObjectFile>(FS::basepart(fn));
 }
 
-
-void ObjectFile::find_depends(Target *tgt)
+void ObjectFile::set_used_in_shared_library(bool u)
 {
-	SourceFile *src = dynamic_cast<SourceFile *>(tgt->get_real_target());
-	FileTarget *file = dynamic_cast<FileTarget *>(tgt);
-	if(!src || !file)
-		return;
+	used_in_shlib = u;
+}
 
-	FS::Path spath = FS::dirname(file->get_path());
-	const StringList &incpath = comp.get_build_info().incpath;
+void ObjectFile::collect_build_info(BuildInfo &binfo) const
+{
+	Target::collect_build_info(binfo);
+	binfo.update_from(component->get_build_info_for_path(source.get_path()));
+}
 
-	const list<string> &includes = src->get_includes();
-	for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
+void ObjectFile::find_dependencies()
+{
+	vector<FileTarget *> headers;
+	find_dependencies(source, headers);
+	for(FileTarget *h: headers)
 	{
-		Target *hdr = builder.get_vfs().find_header(*i, spath, incpath);
-		if(hdr && find(depends.begin(), depends.end(), hdr)==depends.end())
-			add_depend(hdr);
+		add_dependency(*h);
+		if(h->get_real_target()->is_buildable())
+			h->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
 	}
 }
 
-void ObjectFile::add_depend(Target *tgt)
+void ObjectFile::find_dependencies(FileTarget &tgt, vector<FileTarget *> &headers)
 {
-	Target::add_depend(tgt);
-	new_deps.push_back(tgt);
-}
+	tgt.prepare();
 
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
-{
-	const SourcePackage &pkg = comp.get_package();
-	string fn = FS::basepart(src)+".o";
-	if(!fn.compare(0, 2, "./"))
-		fn.erase(0, 2);
-	for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
-		if(*i=='/')
-			*i = '_';
-	return pkg.get_temp_dir()/comp.get_name()/fn;
+	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt.get_real_target());
+	Dependencies deps_to_add = rtgt->get_transitive_dependencies();
+	if(rtgt!=&tgt)
+	{
+		FS::Path inst_dir = rtgt->get_component()->get_install_map().get_install_location(*rtgt);
+		/* The target has been displaced by installing it.  Displace any
+		dependencies that come from the same package as well. */
+		const SourcePackage *tpkg = rtgt->get_package();
+		for(Target *&d: deps_to_add)
+		{
+			FileTarget *file = dynamic_cast<FileTarget *>(d);
+			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
+			{
+				const Component *tcomp = file->get_component();
+				FS::Path dep_inst = tcomp->get_install_map().get_install_location(*file);
+				FS::Path displaced = FS::dirname(tgt.get_path())/FS::relative(dep_inst, inst_dir)/FS::basename(file->get_path());
+				d = builder.get_vfs().get_target(displaced);
+				if(!d)
+				{
+					/* If the target was in an overlay directory and the displaced
+					dependency is not found, try removing the overlay from the path. */
+					string last_dir = FS::basename(FS::dirname(displaced));
+					if(any_equals(tcomp->get_overlays(), last_dir))
+					{
+						displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
+						d = builder.get_vfs().get_target(displaced);
+					}
+				}
+			}
+		}
+	}
+
+	for(Target *d: deps_to_add)
+		if(FileTarget *file = dynamic_cast<FileTarget *>(d))
+		{
+			auto i = lower_bound(headers, file);
+			if(i==headers.end() || *i!=file)
+			{
+				headers.insert(i, file);
+				find_dependencies(*file, headers);
+			}
+		}
 }