Refactor FileTarget and SourceFile constructors

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 634b297b996070e45ed9a98ee736c6e9f4826718..adbb058dc3d192483bbfa7c03f9d042f1e8dcfdb 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -9,11 +9,23 @@
 using namespace std;
 using namespace Msp;
 
-FileTarget::FileTarget(Builder &b, const SourcePackage *p, const FS::Path &a):
-       Target(b, generate_name(p, a)),
-       path(a),
-       size(0)
+FileTarget::FileTarget(Builder &b, const FS::Path &a):
+       Target(b, generate_name(b, 0, a)),
+       path(a)
 {
+       init(0);
+}
+
+FileTarget::FileTarget(Builder &b, const SourcePackage &p, const FS::Path &a):
+       Target(b, generate_name(b, &p, a)),
+       path(a)
+{
+       init(&p);
+}
+
+void FileTarget::init(const SourcePackage *p)
+{
+       size = 0;
        package = p;
 
        builder.get_vfs().register_path(path, this);
@@ -25,23 +37,21 @@ FileTarget::FileTarget(Builder &b, const SourcePackage *p, const FS::Path &a):
        }
 }
 
-string FileTarget::generate_name(const SourcePackage *pkg, const FS::Path &pth)
+string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, const FS::Path &path)
 {
-       if(pkg)
+       if(pkg && FS::descendant_depth(path, pkg->get_source())>=0)
        {
-               if(FS::descendant_depth(pth, pkg->get_source())>=0)
-               {
-                       FS::Path relpath = FS::relative(pth, pkg->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);
-               }
+               FS::Path relpath = FS::relative(path, pkg->get_source());
+               return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+       }
+       else if(FS::descendant_depth(path, builder.get_prefix())>=0)
+       {
+               FS::Path relpath = FS::relative(path, builder.get_prefix());
+               builder.get_logger().log("debug", format("%s %s %s", path, builder.get_prefix(), relpath));
+               return "<prefix>"+relpath.str().substr(1);
        }
 
-       return pth.str();
+       return path.str();
 }
 
 void FileTarget::touch()