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 15bd08b06f7b507b16109c8f08f7933306d1e092..723d776415df33e77c8b1fe53287746bf1dbeeab 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,3 +1,4 @@
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "installedfile.h"
@@ -10,14 +11,7 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
        FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
        source(s)
 {
-       add_depend(&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);
+       add_dependency(source);
 }
 
 FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
@@ -33,7 +27,20 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
        else
                mid = tgt.get_install_location();
 
-       return prefix/mid/FS::basename(tgt.get_path());
+       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()
@@ -49,4 +56,22 @@ void InstalledFile::check_rebuild()
                mark_rebuild(source.get_name()+" has changed");
        else if(source.needs_rebuild())
                mark_rebuild(source.get_name()+" needs rebuilding");
+       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()
+{
+       if(!link.empty() && mtime)
+               FS::unlink(link);
+       FileTarget::clean();
 }