Move file-to-target mapping to a separate class

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index da5cd7a1bf5c4f38c66ec43217117bf25ca8fca6..bc4e110d8700002f822bca478d0e6aa6fde6a8be 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "filetarget.h"
@@ -16,11 +10,11 @@ using namespace std;
 using namespace Msp;
 
 FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
-       Target(b, p, FS::basename(a.str())),
+       Target(b, p, make_name(p, a)),
        path(a),
        size(0)
 {
-       builder.add_target(this);
+       builder.get_vfs().register_path(path, this);
 
        if(FS::Stat st = FS::lstat(path))
        {
@@ -65,3 +59,22 @@ void FileTarget::check_rebuild()
        if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
                mark_rebuild("Package options changed");
 }
+
+string FileTarget::make_name(const Package *pkg, const FS::Path &pth)
+{
+       if(const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(pkg))
+       {
+               if(FS::descendant_depth(pth, spkg->get_source())>=0)
+               {
+                       FS::Path relpath = FS::relative(pth, spkg->get_source());
+                       return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+               }
+               else if(FS::descendant_depth(pth, pkg->get_builder().get_prefix())>=0)
+               {
+                       FS::Path relpath = FS::relative(pth, pkg->get_builder().get_prefix());
+                       return "<prefix>"+relpath.str().substr(1);
+               }
+       }
+
+       return pth.str();
+}