X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=6e45ad27efc66ac65d8e9643b1763c75a4811a17;hb=0da6bc8b63c423167e0c34dced67ec0c0a3fe12c;hp=76e7b69456010b8dd30d233a5d4d23f384ffbb1f;hpb=dfa45a1b64f59515a0b62f0912250fa1cf08b8b9;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 76e7b69..6e45ad2 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -12,36 +12,52 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 	source(s)
 {
 	add_dependency(source);
-
-	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
-		if(!shlib->get_soname().empty())
-			link = FS::dirname(path)/FS::basename(shlib->get_path());
-
-	if(!link.empty())
-		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 = FS::basename(tgt.get_path());
-	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&tgt))
-		if(!shlib->get_soname().empty())
-			fn = shlib->get_soname();
+	string fn = tgt.get_install_filename();
+	if(fn.empty())
+		fn = FS::basename(tgt.get_path());
 
 	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();