Improve cleaning

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 24ba6e1ddc4e5af3e63ce1ab1bd0f211e46c4f01..4638cc40d6cec73cdb4b9af420c3d947da385523 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,22 +1,17 @@
+#include <msp/fs/stat.h>
 #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);
+       add_dependency(source);
 
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
                if(!shlib->get_soname().empty())
@@ -26,6 +21,27 @@ 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 if(const Component *comp = tgt.get_component())
+               mid = comp->get_install_map().get_install_location(tgt);
+       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();
+
+       return prefix/mid/fn;
+}
+
 Target *InstalledFile::get_real_target()
 {
        return source.get_real_target();
@@ -37,20 +53,15 @@ void InstalledFile::check_rebuild()
                mark_rebuild("Does not exist");
        else if(source.get_mtime()>mtime || source.get_size()!=size)
                mark_rebuild(source.get_name()+" has changed");
-       else if(source.get_rebuild())
+       else if(source.needs_rebuild())
                mark_rebuild(source.get_name()+" needs rebuilding");
+       else if(!link.empty() && !FS::exists(link))
+               mark_rebuild("Symlink does not exist");
 }
 
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc)
+void InstalledFile::clean()
 {
-       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());
+       if(!link.empty() && mtime)
+               FS::unlink(link);
+       FileTarget::clean();
 }