X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=6e45ad27efc66ac65d8e9643b1763c75a4811a17;hb=bc85cc286c8a3f1055f1979a7ff8697cf1b61912;hp=b2487537369076f705b136a1023371f9a9cf7356;hpb=cbc6c684472ee8120f29358c0167d98524f1f939;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index b248753..6e45ad2 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -12,30 +12,34 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 	source(s)
 {
 	add_dependency(source);
-
-	/* XXX Ideally, the tool should handle this (symlinks are not necessary for
-	windows dlls).  However, the tool that created the target being installed
-	knows nothing about the InstalledFile. */
-	string base_fn = FS::basename(source.get_path());
-	const string &inst_fn = source.get_install_filename();
-	if(!inst_fn.empty() && inst_fn!=base_fn)
-	{
-		link = FS::dirname(path)/base_fn;
-		builder.get_vfs().register_path(link, this);
-	}
 }
 
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
+FS::Path InstalledFile::generate_target_path(const FS::Path &global_prefix, const FileTarget &tgt, const string &loc)
 {
 	if(!tgt.is_installable() && loc.empty())
 		throw invalid_argument(tgt.get_name()+" is not installable");
 
+	FS::Path prefix;
 	FS::Path mid;
-	if(!loc.empty())
-		mid = loc;
-	else if(const Component *comp = tgt.get_component())
-		mid = comp->get_install_map().get_install_location(tgt);
+	if(!loc.compare(0, 2, "//"))
+	{
+		if(!tgt.get_package())
+			throw invalid_argument("No private install location for "+tgt.get_name());
+
+		prefix = tgt.get_package()->get_temp_directory();
+		mid = loc.substr(2);
+	}
 	else
+	{
+		prefix = global_prefix;
+
+		if(!loc.empty())
+			mid = loc;
+		else if(const Component *comp = tgt.get_component())
+			mid = comp->get_install_map().get_install_location(tgt);
+	}
+
+	if(mid.empty())
 		mid = tgt.get_install_location();
 
 	string fn = tgt.get_install_filename();
@@ -45,6 +49,15 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	return prefix/mid/fn;
 }
 
+void InstalledFile::set_symlink(const FS::Path &l)
+{
+	FS::Path al = FS::dirname(path)/l;
+	if(al==path)
+		throw invalid_argument("InstalledFile::set_symlink");
+	link = FS::dirname(path)/l;
+	builder.get_vfs().register_path(link, this);
+}
+
 Target *InstalledFile::get_real_target()
 {
 	return source.get_real_target();