X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Finstall.cpp;h=7c39ed6f4204a046a1ab0a57f69a49f55e29a30f;hb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;hp=f0cce2301c587729afff93cb4a3760d1b8b0b34d;hpb=f56fa0c68e0eddf1f01c9584b8761431d29e8fa1;p=builder.git diff --git a/source/install.cpp b/source/install.cpp index f0cce23..7c39ed6 100644 --- a/source/install.cpp +++ b/source/install.cpp @@ -25,7 +25,7 @@ Install::Install(Builder &b, const SourcePackage &p, FileTarget &s, const std::s link = FS::dirname(path)/FS::basename(shlib->get_path()); if(!link.empty()) - builder.register_path(link, this); + builder.get_vfs().register_path(link, this); } Target *Install::get_real_target() @@ -43,11 +43,6 @@ void Install::check_rebuild() mark_rebuild(source.get_name()+" needs rebuilding"); } -Action *Install::create_action() -{ - return new Copy(builder, *package, source.get_path(), path, link); -} - FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string &loc) { if(!tgt.get_package()) @@ -89,5 +84,5 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string if(mid.empty()) throw invalid_argument("Don't know where to install "+tgtname); - return (base/mid/tgtname).str(); + return base/mid/tgtname; }