X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstallmap.cpp;h=448f997b2e0822381707238e556be304a7c808d2;hb=6b84e1f5673888753cbe566c1365222ed33fd3ac;hp=22d92b1586751d96943dfe73b675a6d75c112318;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git

diff --git a/source/installmap.cpp b/source/installmap.cpp
index 22d92b1..448f997 100644
--- a/source/installmap.cpp
+++ b/source/installmap.cpp
@@ -1,6 +1,10 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
+#include "component.h"
 #include "filetarget.h"
 #include "installmap.h"
+#include "sourcepackage.h"
+#include "templatefile.h"
 
 using namespace std;
 using namespace Msp;
@@ -15,17 +19,47 @@ void InstallMap::add_mapping(const FS::Path &src, const FS::Path &inst)
 
 FS::Path InstallMap::get_install_location(const FileTarget &target) const
 {
-	const FS::Path &source = target.get_path();
+	const Component *comp = target.get_component();
+	unsigned overlay_depth = 0;
+	if(comp && !comp->get_overlays().empty())
+	{
+		// Check if the target resides in an overlay directory
+		string last_dir = FS::basename(FS::dirname(target.get_path()));
+		if(any_equals(comp->get_overlays(), last_dir))
+			overlay_depth = 1;
+	}
+
+	FS::Path source = target.get_path();
+	if(comp)
+	{
+		/* Check if the target is a generated source file, residing in the
+		temporary directory */
+		const SourcePackage &pkg = comp->get_package();
+		int temp_depth = FS::descendant_depth(source, pkg.get_temp_directory());
+		if(temp_depth>0)
+		{
+			// If it is, use the generating template's directory instead
+			for(Target *d: target.get_dependencies())
+				if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(d))
+				{
+					source = FS::dirname(tmpl->get_path())/FS::basename(source);
+					break;
+				}
+		}
+	}
+
+	/* Look for a mapping entry matching both the target's original location
+	and default install location */
 	FS::Path install = target.get_install_location();
-	for(list<Entry>::const_iterator i=entries.begin(); i!=entries.end(); ++i)
+	for(const Entry &e: entries)
 	{
-		int source_depth = FS::descendant_depth(source, i->source);
+		int source_depth = FS::descendant_depth(source, e.source);
 		if(source_depth>=0)
 		{
-			FS::Path install_base = FS::common_ancestor(install, i->install);
+			FS::Path install_base = FS::common_ancestor(install, e.install);
 			if(install_base.size()>1)
 			{
-				install = i->install/FS::dirname(source).subpath(i->source.size());
+				install = e.install/source.subpath(e.source.size(), source_depth-1-overlay_depth);
 				break;
 			}
 		}