X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=723d776415df33e77c8b1fe53287746bf1dbeeab;hb=df88e22a258f169b9505acb0cb8d0ba7e66af7b6;hp=b2487537369076f705b136a1023371f9a9cf7356;hpb=cbc6c684472ee8120f29358c0167d98524f1f939;p=builder.git diff --git a/source/installedfile.cpp b/source/installedfile.cpp index b248753..723d776 100644 --- a/source/installedfile.cpp +++ b/source/installedfile.cpp @@ -12,17 +12,6 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, source(s) { add_dependency(source); - - /* XXX Ideally, the tool should handle this (symlinks are not necessary for - windows dlls). However, the tool that created the target being installed - knows nothing about the InstalledFile. */ - string base_fn = FS::basename(source.get_path()); - const string &inst_fn = source.get_install_filename(); - if(!inst_fn.empty() && inst_fn!=base_fn) - { - link = FS::dirname(path)/base_fn; - builder.get_vfs().register_path(link, this); - } } FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc) @@ -45,6 +34,15 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT return prefix/mid/fn; } +void InstalledFile::set_symlink(const FS::Path &l) +{ + FS::Path al = FS::dirname(path)/l; + if(al==path) + throw invalid_argument("InstalledFile::set_symlink"); + link = FS::dirname(path)/l; + builder.get_vfs().register_path(link, this); +} + Target *InstalledFile::get_real_target() { return source.get_real_target();