Make tools capable of reporting a system-wide path used to locate input files

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 88672317dc35cab7afa7c5fdef65a8d65edc7e57..62265b0d9c956bbdaf644192f0a5f428ecb483ee 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -10,11 +10,13 @@ using namespace std;
 using namespace Msp;
 
 FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
-       Target(b, p, make_name(p, a)),
+       Target(b, generate_name(p, a)),
        path(a),
        size(0)
 {
-       builder.register_path(path, this);
+       package = p;
+
+       builder.get_vfs().register_path(path, this);
 
        if(FS::Stat st = FS::lstat(path))
        {
@@ -30,7 +32,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-       if(!buildable)
+       if(!tool)
                return;
 
        if(builder.get_build_all())
@@ -39,34 +41,36 @@ void FileTarget::check_rebuild()
                mark_rebuild("Does not exist");
        else
        {
-               for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+               for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
                {
                        FileTarget *ft = dynamic_cast<FileTarget *>(*i);
                        if(ft && ft->get_mtime()>mtime)
                                mark_rebuild((*i)->get_name()+" has changed");
-                       else if((*i)->get_rebuild())
+                       else if((*i)->needs_rebuild())
                                mark_rebuild((*i)->get_name()+" needs rebuilding");
-                       else
-                       {
-                               Target *real = ft->get_real_target();
-                               if(real->get_rebuild())
-                                       mark_rebuild(real->get_name()+" needs rebuilding");
-                       }
                }
        }
 
        const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+       if(!needs_rebuild() && spkg && spkg->get_config().get_mtime()>mtime)
                mark_rebuild("Package options changed");
 }
 
-string FileTarget::make_name(const Package *pkg, const FS::Path &pth)
+string FileTarget::generate_name(const Package *pkg, const FS::Path &pth)
 {
        if(const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(pkg))
        {
-               FS::Path relpath = FS::relative(pth, spkg->get_source());
-               return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+               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);
+               }
        }
-       else
-               return pth.str();
+
+       return pth.str();
 }