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

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index f24d028..00fa679 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "component.h"
@@ -10,80 +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)
 {
-	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(dynamic_cast<FileTarget *>(tgt));
-		}
-		else
-			++i;
+		if(!fn.empty())
+			fn += '_';
+		if(c!=".")
+			fn += c;
 	}
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return temp_dir/comp.get_name()/arch.create_filename<ObjectFile>(FS::basepart(fn));
+}
 
-	deps_ready = new_deps.empty();
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+	used_in_shlib = u;
 }
 
+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()));
+}
 
-void ObjectFile::find_depends(FileTarget *tgt)
+void ObjectFile::find_dependencies()
 {
-	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
-	const Dependencies &tdeps = rtgt->get_depends();
-	Dependencies deps_to_add;
-	if(rtgt==tgt)
+	vector<FileTarget *> headers;
+	find_dependencies(source, headers);
+	for(FileTarget *h: headers)
 	{
-		/* We are using the target from its original location, so dependencies
-		apply directly */
-		deps_to_add = tdeps;
+		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)));
 	}
-	else
+}
+
+void ObjectFile::find_dependencies(FileTarget &tgt, vector<FileTarget *> &headers)
+{
+	tgt.prepare();
+
+	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 = dynamic_cast<const SourcePackage *>(rtgt->get_package());
-		for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
+		const SourcePackage *tpkg = rtgt->get_package();
+		for(Target *&d: deps_to_add)
 		{
-			FileTarget *file = dynamic_cast<FileTarget *>(*i);
-			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source())>=0)
+			FileTarget *file = dynamic_cast<FileTarget *>(d);
+			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
 			{
-				FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
-				if(Target *ddep = builder.get_vfs().get_target(displaced))
-					deps_to_add.push_back(ddep);
+				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);
+					}
+				}
 			}
-			else
-				deps_to_add.push_back(*i);
 		}
 	}
 
-	for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
-		if(find(depends.begin(), depends.end(), *i)==depends.end())
-			add_depend(*i);
-}
-
-void ObjectFile::add_depend(Target *tgt)
-{
-	Target::add_depend(tgt);
-	new_deps.push_back(tgt);
-}
-
-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;
+	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);
+			}
+		}
 }