From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 5 Sep 2012 16:54:45 +0000 (+0300)
Subject: More generic system for installing targets under different names
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=cbc6c684472ee8120f29358c0167d98524f1f939;p=builder.git

More generic system for installing targets under different names
---

diff --git a/source/filetarget.h b/source/filetarget.h
index a48e1ab..da6b9a8 100644
--- a/source/filetarget.h
+++ b/source/filetarget.h
@@ -15,6 +15,7 @@ protected:
 	Msp::Time::TimeStamp mtime;
 	unsigned size;
 	Msp::FS::Path install_location;
+	std::string install_filename;
 
 	FileTarget(Builder &, const Msp::FS::Path &);
 	FileTarget(Builder &, const SourcePackage &, const Msp::FS::Path &);
@@ -30,6 +31,7 @@ public:
 
 	bool is_installable() const { return !install_location.empty(); }
 	const Msp::FS::Path &get_install_location() const { return install_location; }
+	const std::string &get_install_filename() const { return install_filename; }
 
 	/// Changes the mtime of the target to the current time.
 	void touch();
diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 76e7b69..b248753 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -13,12 +13,16 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &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())
+	/* 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)
@@ -34,10 +38,9 @@ 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;
 }
diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 9b2fdbb..5fcbe74 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -33,6 +33,7 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 				break;
 
 		soname = format("%s.%s", FS::basename(path), version.substr(0, i));
+		install_filename = soname;
 	}
 }