Move the bpk files into a subdirectory and install them

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 76e7b69456010b8dd30d233a5d4d23f384ffbb1f..723d776415df33e77c8b1fe53287746bf1dbeeab 100644 (file)
--- 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();