Make install_location a path

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 5ed3139cd38d5d9fdd407dafb5813e1b3d7cd896..a71bcba3c29adae803f357c1455ad3dc76bae2d5 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,19 +1,13 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
-#include "copy.h"
-#include "executable.h"
-#include "datafile.h"
 #include "installedfile.h"
-#include "package.h"
-#include "pkgconfig.h"
 #include "sharedlibrary.h"
-#include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
-InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc):
-       FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
+InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &loc):
+       FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
        source(s)
 {
        add_depend(&source);
@@ -26,6 +20,20 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
                builder.get_vfs().register_path(link, this);
 }
 
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
+{
+       if(!tgt.is_installable() && loc.empty())
+               throw invalid_argument(tgt.get_name()+" is not installable");
+
+       FS::Path mid;
+       if(!loc.empty())
+               mid = loc;
+       else
+               mid = tgt.get_install_location();
+
+       return prefix/mid/FS::basename(tgt.get_path());
+}
+
 Target *InstalledFile::get_real_target()
 {
        return source.get_real_target();
@@ -40,17 +48,3 @@ void InstalledFile::check_rebuild()
        else if(source.needs_rebuild())
                mark_rebuild(source.get_name()+" needs rebuilding");
 }
-
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc)
-{
-       if(!tgt.is_installable() && loc.empty())
-               throw invalid_argument(tgt.get_name()+" is not installable");
-
-       string mid;
-       if(!loc.empty())
-               mid = loc;
-       else
-               mid = tgt.get_install_location();
-
-       return prefix/mid/FS::basename(tgt.get_path());
-}