X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=723d776415df33e77c8b1fe53287746bf1dbeeab;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=4638cc40d6cec73cdb4b9af420c3d947da385523;hpb=1c43971ed99fd2f72ae171d6cdafabab74e37f4e;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 4638cc4..723d776 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -12,13 +12,6 @@ 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)
@@ -34,14 +27,22 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	else
 		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();
@@ -55,8 +56,17 @@ void InstalledFile::check_rebuild()
 		mark_rebuild(source.get_name()+" has changed");
 	else if(source.needs_rebuild())
 		mark_rebuild(source.get_name()+" needs rebuilding");
-	else if(!link.empty() && !FS::exists(link))
-		mark_rebuild("Symlink does not exist");
+	if(!needs_rebuild() && !link.empty())
+	{
+		if(!FS::exists(link))
+			mark_rebuild("Symlink does not exist");
+		else
+		{
+			FS::Path rel_path = FS::relative(path, FS::dirname(link));
+			if(FS::readlink(link)!=rel_path)
+				mark_rebuild("Symlink needs updating");
+		}
+	}
 }
 
 void InstalledFile::clean()