Support "installing" files to a private staging area

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 723d776415df33e77c8b1fe53287746bf1dbeeab..6e45ad27efc66ac65d8e9643b1763c75a4811a17 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -14,17 +14,32 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
        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();
 
        string fn = tgt.get_install_filename();