Support "installing" files to a private staging area

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 15bd08b06f7b507b16109c8f08f7933306d1e092..6e45ad27efc66ac65d8e9643b1763c75a4811a17 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,30 +11,51 @@ 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)
+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();
 
-       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 +71,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();
 }